2 files changed, 5 insertions, 0 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 54b4077fed7..a8ddadbc745 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1156,10 +1156,12 @@ SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
         omqstat.mq_flags = filp->f_flags & O_NONBLOCK;
         if (u_mqstat) {
                 audit_mq_getsetattr(mqdes, &mqstat);
+                spin_lock(&filp->f_lock);
                 if (mqstat.mq_flags & O_NONBLOCK)
                         filp->f_flags |= O_NONBLOCK;
                 else
                         filp->f_flags &= ~O_NONBLOCK;
+                spin_unlock(&filp->f_lock);
 
                 inode->i_atime = inode->i_ctime = CURRENT_TIME;
         }
diff --git a/ipc/shm.c b/ipc/shm.c
index 05d51d2a792..f239d87e0d3 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -39,6 +39,7 @@
 #include <linux/nsproxy.h>
 #include <linux/mount.h>
 #include <linux/ipc_namespace.h>
+#include <linux/ima.h>
 
 #include <asm/uaccess.h>
 
@@ -383,6 +384,7 @@ 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) {
@@ -887,6 +889,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);
 
         file->private_data = sfd;
         file->f_mapping = shp->shm_file->f_mapping;