diff mbox series

[SRU,Trusty,1/1] Sanitize 'move_pages()' permission checks

Message ID 20171207115647.29098-2-kleber.souza@canonical.com
State New
Headers show
Series Fix for CVE-2017-14140 | expand

Commit Message

Kleber Sacilotto de Souza Dec. 7, 2017, 11:56 a.m. UTC 
From: Linus Torvalds <torvalds@linux-foundation.org>

The 'move_paghes()' system call was introduced long long ago with the
same permission checks as for sending a signal (except using
CAP_SYS_NICE instead of CAP_SYS_KILL for the overriding capability).

That turns out to not be a great choice - while the system call really
only moves physical page allocations around (and you need other
capabilities to do a lot of it), you can check the return value to map
out some the virtual address choices and defeat ASLR of a binary that
still shares your uid.

So change the access checks to the more common 'ptrace_may_access()'
model instead.

This tightens the access checks for the uid, and also effectively
changes the CAP_SYS_NICE check to CAP_SYS_PTRACE, but it's unlikely that
anybody really _uses_ this legacy system call any more (we hav ebetter
NUMA placement models these days), so I expect nobody to notice.

Famous last words.

Reported-by: Otto Ebeling <otto.ebeling@iki.fi>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Willy Tarreau <w@1wt.eu>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

CVE-2017-14140
(backported from commit 197e7e521384a23b9e585178f3f11c9fa08274b9)
[klebers: Trusty kernel doesn't have caaee6234d05a, which introduced
 the check for PTRACE_MODE_READ_REALCREDS. However, checking for
 PTRACE_MODE_READ should be enough, as discussed at
 https://bugzilla.novell.com/show_bug.cgi?id=1057179#c5]
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---
 mm/migrate.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Comments

Thadeu Lima de Souza Cascardo Dec. 13, 2017, 8:19 a.m. UTC | #1 
Applied to trusty master-next branch.

Thanks.
Cascardo.

Applied-to: trusty/master-next
diff mbox series

Patch

diff --git a/mm/migrate.c b/mm/migrate.c
index 70eb6bb9a8e6..21f477b133c4 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -38,6 +38,7 @@ 
 #include <linux/gfp.h>
 #include <linux/balloon_compaction.h>
 #include <linux/mmu_notifier.h>
+#include <linux/ptrace.h>
 
 #include <asm/tlbflush.h>
 
@@ -1441,7 +1442,6 @@  SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
 		const int __user *, nodes,
 		int __user *, status, int, flags)
 {
-	const struct cred *cred = current_cred(), *tcred;
 	struct task_struct *task;
 	struct mm_struct *mm;
 	int err;
@@ -1465,14 +1465,9 @@  SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
 
 	/*
 	 * Check if this process has the right to modify the specified
-	 * process. The right exists if the process has administrative
-	 * capabilities, superuser privileges or the same
-	 * userid as the target process.
+	 * process. Use the regular "ptrace_may_access()" checks.
 	 */
-	tcred = __task_cred(task);
-	if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
-	    !uid_eq(cred->uid,  tcred->suid) && !uid_eq(cred->uid,  tcred->uid) &&
-	    !capable(CAP_SYS_NICE)) {
+	if (!ptrace_may_access(task, PTRACE_MODE_READ)) {
 		rcu_read_unlock();
 		err = -EPERM;
 		goto out;