1 files changed, 6 insertions, 1 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 406c5b208193..5e2cbfdab6fc 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1036,6 +1036,10 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
         sfd->file = shp->shm_file;
         sfd->vm_ops = NULL;
 
+        err = security_mmap_file(file, prot, flags);
+        if (err)
+                goto out_fput;
+
         down_write(&current->mm->mmap_sem);
         if (addr && !(shmflg & SHM_REMAP)) {
                 err = -EINVAL;
@@ -1050,7 +1054,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
                         goto invalid;
         }
                 
-        user_addr = do_mmap (file, addr, size, prot, flags, 0);
+        user_addr = do_mmap_pgoff(file, addr, size, prot, flags, 0);
         *raddr = user_addr;
         err = 0;
         if (IS_ERR_VALUE(user_addr))
@@ -1058,6 +1062,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
 invalid:
         up_write(&current->mm->mmap_sem);
 
+out_fput:
         fput(file);
 
 out_nattch: