summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-12-16 04:53:03 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-16 12:16:47 -0500
commit0552f879d45cecc35d8e372a591fc5ed863bca58 (patch)
treef3e0d76f7d5e7cf9a11ef4771294c7b4b552cd89 /ipc
parent7715b521222b6ebb6e927fa261ed91ed687fe454 (diff)
downloadblackbird-op-linux-0552f879d45cecc35d8e372a591fc5ed863bca58.tar.gz
blackbird-op-linux-0552f879d45cecc35d8e372a591fc5ed863bca58.zip
Untangling ima mess, part 1: alloc_file()
There are 2 groups of alloc_file() callers: * ones that are followed by ima_counts_get * ones giving non-regular files So let's pull that ima_counts_get() into alloc_file(); it's a no-op in case of non-regular files. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 16e39230aa0d..02620fae8e1f 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -39,7 +39,6 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
#include <linux/ipc_namespace.h>
-#include <linux/ima.h>
#include <asm/uaccess.h>
@@ -895,7 +894,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
&shm_file_operations);
if (!file)
goto out_free;
- ima_counts_get(file);
file->private_data = sfd;
file->f_mapping = shp->shm_file->f_mapping;
OpenPOWER on IntegriCloud