diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 13:50:22 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 13:50:40 (GMT) |
| commit | 5304d5fc74a269cc6c3e70f9713684ca729abdf0 (patch) | |
| tree | 6a5db62915abd260241a2b9aee34086c93293ca6 /ipc | |
| parent | 54d35f29f49224d86b994acb6e5969b9ba09022d (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
| download | linux-fsl-qoriq-5304d5fc74a269cc6c3e70f9713684ca729abdf0.tar.xz | |
Merge branch 'linus' into sched/core
Merge reason: branch had an old upstream base (-rc1-ish), but also
merge to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index e35ba2c..c5e68ad 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -32,6 +32,7 @@ #include <linux/nsproxy.h> #include <linux/pid.h> #include <linux/ipc_namespace.h> +#include <linux/ima.h> #include <net/sock.h> #include "util.h" @@ -733,6 +734,7 @@ 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; |