summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorJames Morris2009-06-11 03:03:14 +0200
committerJames Morris2009-06-11 03:03:14 +0200
commit73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch)
tree7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /ipc
parentMerge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentnommu: Provide mmap_min_addr definition. (diff)
downloadkernel-qcow2-linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.gz
kernel-qcow2-linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.xz
kernel-qcow2-linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 425971600485..15dd238e5338 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -384,7 +384,6 @@ 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);
id = ipc_addid(&shm_ids(ns), &shp->shm_perm, ns->shm_ctlmni);
if (id < 0) {
@@ -891,7 +890,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;