diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-05-19 13:25:57 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-22 09:43:41 +1000 |
| commit | b9fc745db833bbf74b4988493b8cd902a84c9415 (patch) | |
| tree | 45a15174efb3b1c3dcbe5f0dc503e790c4f6fd70 /ipc/shm.c | |
| parent | 932995f0ce52525b32ff5127b522c2c164de3810 (diff) | |
| download | linux-stable-b9fc745db833bbf74b4988493b8cd902a84c9415.tar.gz linux-stable-b9fc745db833bbf74b4988493b8cd902a84c9415.tar.bz2 linux-stable-b9fc745db833bbf74b4988493b8cd902a84c9415.zip | |
integrity: path_check update
- Add support in ima_path_check() for integrity checking without
incrementing the counts. (Required for nfsd.)
- rename and export opencount_get to ima_counts_get
- replace ima_shm_check calls with ima_counts_get
- export ima_path_check
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'ipc/shm.c')
| -rw-r--r-- | ipc/shm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index faa46da99ebe..47b464229cd5 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -384,7 +384,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) error = PTR_ERR(file); if (IS_ERR(file)) goto no_file; - ima_shm_check(file); + ima_counts_get(file); id = ipc_addid(&shm_ids(ns), &shp->shm_perm, ns->shm_ctlmni); if (id < 0) { @@ -891,7 +891,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) file = alloc_file(path.mnt, path.dentry, f_mode, &shm_file_operations); if (!file) goto out_free; - ima_shm_check(file); + ima_counts_get(file); file->private_data = sfd; file->f_mapping = shp->shm_file->f_mapping; |