diff options
| author | James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /ipc | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff) | |
| download | kernel-crypto-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.gz kernel-crypto-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.xz kernel-crypto-73fbad283cfbbcf02939bdbda31fc4a30e729cca.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 42597160048..15dd238e533 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; |