diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 06:27:40 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:16:47 -0500 |
commit | b65a9cfc2c38eebc33533280b8ad5841caee8b6e (patch) | |
tree | d6e5b713615cc5e65c900162ab09235ae4847909 /ipc | |
parent | 0552f879d45cecc35d8e372a591fc5ed863bca58 (diff) |
Untangling ima mess, part 2: deal with counters
* do ima_get_count() in __dentry_open()
* stop doing that in followups
* move ima_path_check() to right after nameidata_to_filp()
* don't bump counters on it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index ee9d69707c0..c79bd57353e 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/nsproxy.h> | 32 | #include <linux/nsproxy.h> |
33 | #include <linux/pid.h> | 33 | #include <linux/pid.h> |
34 | #include <linux/ipc_namespace.h> | 34 | #include <linux/ipc_namespace.h> |
35 | #include <linux/ima.h> | ||
36 | 35 | ||
37 | #include <net/sock.h> | 36 | #include <net/sock.h> |
38 | #include "util.h" | 37 | #include "util.h" |
@@ -734,7 +733,6 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode, | |||
734 | error = PTR_ERR(filp); | 733 | error = PTR_ERR(filp); |
735 | goto out_putfd; | 734 | goto out_putfd; |
736 | } | 735 | } |
737 | ima_counts_get(filp); | ||
738 | 736 | ||
739 | fd_install(fd, filp); | 737 | fd_install(fd, filp); |
740 | goto out_upsem; | 738 | goto out_upsem; |