diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-02-15 22:22:54 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-23 16:36:50 -0400 |
| commit | ec6fd8a4355cda81cd9f06bebc048e83eb514ac7 (patch) | |
| tree | 828c3f2e1b474cc0ec9768d5dc19cfa2c086898f /fs/proc/task_mmu.c | |
| parent | ca6b0bf0e086513b9ee5efc0aa5770ecb57778af (diff) | |
| download | linux-3.10-ec6fd8a4355cda81cd9f06bebc048e83eb514ac7.tar.gz linux-3.10-ec6fd8a4355cda81cd9f06bebc048e83eb514ac7.tar.bz2 linux-3.10-ec6fd8a4355cda81cd9f06bebc048e83eb514ac7.zip | |
report errors in /proc/*/*map* sanely
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index c966413c139..8fed0f88fbf 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -119,11 +119,11 @@ static void *m_start(struct seq_file *m, loff_t *pos) priv->task = get_pid_task(priv->pid, PIDTYPE_PID); if (!priv->task) - return NULL; + return ERR_PTR(-ESRCH); mm = mm_for_maps(priv->task); - if (!mm) - return NULL; + if (!mm || IS_ERR(mm)) + return mm; down_read(&mm->mmap_sem); tail_vma = get_gate_vma(priv->task); @@ -728,9 +728,9 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, if (!task) goto out; - ret = -EACCES; mm = mm_for_maps(task); - if (!mm) + ret = PTR_ERR(mm); + if (!mm || IS_ERR(mm)) goto out_task; ret = -EINVAL; |