diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-02-15 22:04:37 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-23 16:36:50 -0400 |
commit | ca6b0bf0e086513b9ee5efc0aa5770ecb57778af (patch) | |
tree | 4fec50b38253288746ac4b4ea6d4bf5216b0c53b /fs/proc/task_mmu.c | |
parent | 26ec3c646e75ce7a69fda429d68fcbdcd5eacc62 (diff) |
pagemap: close races with suid execve
just use mm_for_maps()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc/task_mmu.c')
-rw-r--r-- | fs/proc/task_mmu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 60b914860f81..c966413c139b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -729,7 +729,8 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, | |||
729 | goto out; | 729 | goto out; |
730 | 730 | ||
731 | ret = -EACCES; | 731 | ret = -EACCES; |
732 | if (!ptrace_may_access(task, PTRACE_MODE_READ)) | 732 | mm = mm_for_maps(task); |
733 | if (!mm) | ||
733 | goto out_task; | 734 | goto out_task; |
734 | 735 | ||
735 | ret = -EINVAL; | 736 | ret = -EINVAL; |
@@ -742,10 +743,6 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, | |||
742 | if (!count) | 743 | if (!count) |
743 | goto out_task; | 744 | goto out_task; |
744 | 745 | ||
745 | mm = get_task_mm(task); | ||
746 | if (!mm) | ||
747 | goto out_task; | ||
748 | |||
749 | pm.len = PM_ENTRY_BYTES * (PAGEMAP_WALK_SIZE >> PAGE_SHIFT); | 746 | pm.len = PM_ENTRY_BYTES * (PAGEMAP_WALK_SIZE >> PAGE_SHIFT); |
750 | pm.buffer = kmalloc(pm.len, GFP_TEMPORARY); | 747 | pm.buffer = kmalloc(pm.len, GFP_TEMPORARY); |
751 | ret = -ENOMEM; | 748 | ret = -ENOMEM; |