lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 14/80] proc: Fix ptrace-based permission checks for accessing task maps
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Corey Wright <undefined@pobox.com>

    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.

    Signed-off-by: Corey Wright <undefined@pobox.com>
    Acked-by: Jann Horn <jann@thejh.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/proc/task_mmu.c | 4 ++--
    fs/proc/task_nommu.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/fs/proc/task_mmu.c
    +++ b/fs/proc/task_mmu.c
    @@ -170,7 +170,7 @@ static void *m_start(struct seq_file *m,
    if (!priv->task)
    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))
    return mm;
    down_read(&mm->mmap_sem);
    @@ -1044,7 +1044,7 @@ static ssize_t pagemap_read(struct file
    if (!pm.buffer)
    goto out_task;

    - mm = mm_access(task, PTRACE_MODE_READ);
    + mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);
    ret = PTR_ERR(mm);
    if (!mm || IS_ERR(mm))
    goto out_free;
    --- a/fs/proc/task_nommu.c
    +++ b/fs/proc/task_nommu.c
    @@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m,
    if (!priv->task)
    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)) {
    put_task_struct(priv->task);
    priv->task = NULL;

    \
     
     \ /
      Last update: 2016-03-02 04:21    [W:4.104 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site