* Re: [PATCH stable<3.18 1/1] proc: Fix ptrace-based permission checks for accessing task maps
2016-02-28 8:42 ` [PATCH 1/1] " Corey Wright
@ 2016-02-28 10:00 ` Jiri Slaby
2016-02-28 11:11 ` [PATCH " Jann Horn
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Slaby @ 2016-02-28 10:00 UTC (permalink / raw)
To: Corey Wright, stable; +Cc: Jann Horn, oleg, roland, Linux kernel mailing list
CCing ptrace guys.
I would appreciate if somebody could ACK this.
On 02/28/2016, 09:42 AM, Corey Wright wrote:
> 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>
> Cc: Jann Horn <jann@thejh.net>
> ---
> fs/proc/task_mmu.c | 4 ++--
> fs/proc/task_nommu.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
> index 9f285fb..b86db12 100644
> --- a/fs/proc/task_mmu.c
> +++ b/fs/proc/task_mmu.c
> @@ -170,7 +170,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
> 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 *file, char __user *buf,
> 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;
> diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
> index 56123a6..123c198 100644
> --- a/fs/proc/task_nommu.c
> +++ b/fs/proc/task_nommu.c
> @@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
> 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;
>
--
js
suse labs
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] proc: Fix ptrace-based permission checks for accessing task maps
2016-02-28 8:42 ` [PATCH 1/1] " Corey Wright
2016-02-28 10:00 ` [PATCH stable<3.18 " Jiri Slaby
@ 2016-02-28 11:11 ` Jann Horn
2016-03-01 8:15 ` Patch "proc: Fix ptrace-based permission checks for accessing task maps" has been added to the 3.10-stable tree gregkh
2016-03-01 8:15 ` Patch "proc: Fix ptrace-based permission checks for accessing task maps" has been added to the 3.14-stable tree gregkh
3 siblings, 0 replies; 6+ messages in thread
From: Jann Horn @ 2016-02-28 11:11 UTC (permalink / raw)
To: Corey Wright; +Cc: stable
[-- Attachment #1: Type: text/plain, Size: 2324 bytes --]
On Sun, Feb 28, 2016 at 02:42:39AM -0600, Corey Wright wrote:
> 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.
The patch looks good to me, the FSCREDS mode is appropriate there.
(Note: There is probably going to be another patch that touches lots of
procfs stuff soon, and if it gets backported, the functions changed in
this patch should probably be changed for that backport again.)
> Signed-off-by: Corey Wright <undefined@pobox.com>
> Cc: Jann Horn <jann@thejh.net>
> ---
> fs/proc/task_mmu.c | 4 ++--
> fs/proc/task_nommu.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
> index 9f285fb..b86db12 100644
> --- a/fs/proc/task_mmu.c
> +++ b/fs/proc/task_mmu.c
> @@ -170,7 +170,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
> 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 *file, char __user *buf,
> 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;
> diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
> index 56123a6..123c198 100644
> --- a/fs/proc/task_nommu.c
> +++ b/fs/proc/task_nommu.c
> @@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
> 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;
> --
> 1.7.9.5
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Patch "proc: Fix ptrace-based permission checks for accessing task maps" has been added to the 3.10-stable tree
2016-02-28 8:42 ` [PATCH 1/1] " Corey Wright
2016-02-28 10:00 ` [PATCH stable<3.18 " Jiri Slaby
2016-02-28 11:11 ` [PATCH " Jann Horn
@ 2016-03-01 8:15 ` gregkh
2016-03-01 8:15 ` Patch "proc: Fix ptrace-based permission checks for accessing task maps" has been added to the 3.14-stable tree gregkh
3 siblings, 0 replies; 6+ messages in thread
From: gregkh @ 2016-03-01 8:15 UTC (permalink / raw)
To: undefined, gregkh, jann; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
proc: Fix ptrace-based permission checks for accessing task maps
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
proc-fix-ptrace-based-permission-checks-for-accessing-task-maps.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From undefined@pobox.com Mon Feb 29 22:02:13 2016
From: Corey Wright <undefined@pobox.com>
Date: Sun, 28 Feb 2016 02:42:39 -0600
Subject: proc: Fix ptrace-based permission checks for accessing task maps
To: stable@vger.kernel.org
Cc: Jann Horn <jann@thejh.net>
Message-ID: <20160228024239.c82b6c2db17c670611ee6b16@pobox.com>
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;
Patches currently in stable-queue which might be from undefined@pobox.com are
queue-3.10/proc-fix-ptrace-based-permission-checks-for-accessing-task-maps.patch
^ permalink raw reply [flat|nested] 6+ messages in thread* Patch "proc: Fix ptrace-based permission checks for accessing task maps" has been added to the 3.14-stable tree
2016-02-28 8:42 ` [PATCH 1/1] " Corey Wright
` (2 preceding siblings ...)
2016-03-01 8:15 ` Patch "proc: Fix ptrace-based permission checks for accessing task maps" has been added to the 3.10-stable tree gregkh
@ 2016-03-01 8:15 ` gregkh
3 siblings, 0 replies; 6+ messages in thread
From: gregkh @ 2016-03-01 8:15 UTC (permalink / raw)
To: undefined, gregkh, jann; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
proc: Fix ptrace-based permission checks for accessing task maps
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
proc-fix-ptrace-based-permission-checks-for-accessing-task-maps.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From undefined@pobox.com Mon Feb 29 22:02:13 2016
From: Corey Wright <undefined@pobox.com>
Date: Sun, 28 Feb 2016 02:42:39 -0600
Subject: proc: Fix ptrace-based permission checks for accessing task maps
To: stable@vger.kernel.org
Cc: Jann Horn <jann@thejh.net>
Message-ID: <20160228024239.c82b6c2db17c670611ee6b16@pobox.com>
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
@@ -165,7 +165,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);
@@ -1182,7 +1182,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
@@ -216,7 +216,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;
Patches currently in stable-queue which might be from undefined@pobox.com are
queue-3.14/proc-fix-ptrace-based-permission-checks-for-accessing-task-maps.patch
^ permalink raw reply [flat|nested] 6+ messages in thread