commit 8b3ec6814c83d76b85bd13badc48552836c24839
author Al Viro <viro@zeniv.linux.org.uk> Wed May 30 17:11:23 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Jun 01 10:37:01 2012 -0400
tree 2430a4511c7ea41f67b0d841f4c42eac43828db3
parent e5467859f7f79b69fc49004403009dfdba3bec53

take security_mmap_file() outside of ->mmap_sem

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

ipc/shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index 406c5b2..e3a8063 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1036,6 +1036,10 @@
 	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;
@@ -1058,6 +1062,7 @@
 invalid:
 	up_write(&current->mm->mmap_sem);
 
+out_fput:
 	fput(file);
 
 out_nattch: