diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-02-16 04:22:54 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-23 21:36:50 +0100 |
| commit | ec6fd8a4355cda81cd9f06bebc048e83eb514ac7 (patch) | |
| tree | 828c3f2e1b474cc0ec9768d5dc19cfa2c086898f /fs/proc/base.c | |
| parent | pagemap: close races with suid execve (diff) | |
| download | linux-ec6fd8a4355cda81cd9f06bebc048e83eb514ac7.tar.xz linux-ec6fd8a4355cda81cd9f06bebc048e83eb514ac7.zip | |
report errors in /proc/*/*map* sanely
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index df73573e12c9..c28281102082 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -225,15 +225,17 @@ static int check_mem_permission(struct task_struct *task) struct mm_struct *mm_for_maps(struct task_struct *task) { struct mm_struct *mm; + int err; - if (mutex_lock_killable(&task->signal->cred_guard_mutex)) - return NULL; + err = mutex_lock_killable(&task->signal->cred_guard_mutex); + if (err) + return ERR_PTR(err); mm = get_task_mm(task); if (mm && mm != current->mm && !ptrace_may_access(task, PTRACE_MODE_READ)) { mmput(mm); - mm = NULL; + mm = ERR_PTR(-EACCES); } mutex_unlock(&task->signal->cred_guard_mutex); |