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) | |
| download | linux-stable-b65a9cfc2c38eebc33533280b8ad5841caee8b6e.tar.gz linux-stable-b65a9cfc2c38eebc33533280b8ad5841caee8b6e.tar.bz2 linux-stable-b65a9cfc2c38eebc33533280b8ad5841caee8b6e.zip | |
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 ee9d69707c0a..c79bd57353e7 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -32,7 +32,6 @@ #include <linux/nsproxy.h> #include <linux/pid.h> #include <linux/ipc_namespace.h> -#include <linux/ima.h> #include <net/sock.h> #include "util.h" @@ -734,7 +733,6 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode, error = PTR_ERR(filp); goto out_putfd; } - ima_counts_get(filp); fd_install(fd, filp); goto out_upsem; |