diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 17:11:23 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 10:37:01 -0400 |
| commit | 8b3ec6814c83d76b85bd13badc48552836c24839 (patch) | |
| tree | 2430a4511c7ea41f67b0d841f4c42eac43828db3 /ipc | |
| parent | e5467859f7f79b69fc49004403009dfdba3bec53 (diff) | |
| download | linux-3.10-8b3ec6814c83d76b85bd13badc48552836c24839.tar.gz linux-3.10-8b3ec6814c83d76b85bd13badc48552836c24839.tar.bz2 linux-3.10-8b3ec6814c83d76b85bd13badc48552836c24839.zip | |
take security_mmap_file() outside of ->mmap_sem
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 406c5b20819..e3a8063b176 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(¤t->mm->mmap_sem); if (addr && !(shmflg & SHM_REMAP)) { err = -EINVAL; @@ -1058,6 +1062,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) invalid: up_write(¤t->mm->mmap_sem); +out_fput: fput(file); out_nattch: |