diff options
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 917f338a6739..f3c2e4085fed 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -235,9 +235,8 @@ static int check_mem_permission(struct task_struct *task) | |||
| 235 | struct mm_struct *mm_for_maps(struct task_struct *task) | 235 | struct mm_struct *mm_for_maps(struct task_struct *task) |
| 236 | { | 236 | { |
| 237 | struct mm_struct *mm = get_task_mm(task); | 237 | struct mm_struct *mm = get_task_mm(task); |
| 238 | if (!mm) | 238 | |
| 239 | return NULL; | 239 | if (mm && mm != current->mm) { |
| 240 | if (mm != current->mm) { | ||
| 241 | /* | 240 | /* |
| 242 | * task->mm can be changed before security check, | 241 | * task->mm can be changed before security check, |
| 243 | * in that case we must notice the change after. | 242 | * in that case we must notice the change after. |
| @@ -245,10 +244,9 @@ struct mm_struct *mm_for_maps(struct task_struct *task) | |||
| 245 | if (!ptrace_may_access(task, PTRACE_MODE_READ) || | 244 | if (!ptrace_may_access(task, PTRACE_MODE_READ) || |
| 246 | mm != task->mm) { | 245 | mm != task->mm) { |
| 247 | mmput(mm); | 246 | mmput(mm); |
| 248 | return NULL; | 247 | mm = NULL; |
| 249 | } | 248 | } |
| 250 | } | 249 | } |
| 251 | down_read(&mm->mmap_sem); | ||
| 252 | return mm; | 250 | return mm; |
| 253 | } | 251 | } |
| 254 | 252 | ||
