Commit fa69c2b4 authored by Corey Wright's avatar Corey Wright Committed by Jiri Slaby

proc: Fix ptrace-based permission checks for accessing task maps

Modify mm_access() calls in fs/proc/task_mmu.c and fs/proc/task_nommu.c to
have the mode include PTRACE_MODE_FSCREDS so accessing /proc/pid/maps and
/proc/pid/pagemap is not denied to all users.

In backporting upstream commit caaee623 to pre-3.18 kernel versions it was
overlooked that mm_access() is used in fs/proc/task_*mmu.c as those calls
were removed in 3.18 (by upstream commit 29a40ace) and did not exist at the
time of the original commit.

Fixes: caaee623 ("ptrace: use fsuid, fsgid, effective creds for fs access checks")
Signed-off-by: default avatarCorey Wright <undefined@pobox.com>
Acked-by: default avatarJann Horn <jann@thejh.net>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent bb47c5ec
...@@ -172,7 +172,7 @@ static void *m_start(struct seq_file *m, loff_t *pos) ...@@ -172,7 +172,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
if (!priv->task) if (!priv->task)
return ERR_PTR(-ESRCH); return ERR_PTR(-ESRCH);
mm = mm_access(priv->task, PTRACE_MODE_READ); mm = mm_access(priv->task, PTRACE_MODE_READ_FSCREDS);
if (!mm || IS_ERR(mm)) if (!mm || IS_ERR(mm))
return mm; return mm;
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
...@@ -1186,7 +1186,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, ...@@ -1186,7 +1186,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
if (!pm.buffer) if (!pm.buffer)
goto out_task; goto out_task;
mm = mm_access(task, PTRACE_MODE_READ); mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);
ret = PTR_ERR(mm); ret = PTR_ERR(mm);
if (!mm || IS_ERR(mm)) if (!mm || IS_ERR(mm))
goto out_free; goto out_free;
......
...@@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m, loff_t *pos) ...@@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
if (!priv->task) if (!priv->task)
return ERR_PTR(-ESRCH); return ERR_PTR(-ESRCH);
mm = mm_access(priv->task, PTRACE_MODE_READ); mm = mm_access(priv->task, PTRACE_MODE_READ_FSCREDS);
if (!mm || IS_ERR(mm)) { if (!mm || IS_ERR(mm)) {
put_task_struct(priv->task); put_task_struct(priv->task);
priv->task = NULL; priv->task = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment