linux-kernel - [tip:x86/pti] x86/tls: Fix possible spectre-v1 in do_get_thread

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-993773d11d45c90cb1c6481c2638c3d9f092ea5b@git.kernel.org>
Date:   Thu, 27 Jun 2019 14:52:44 -0700
From:   tip-bot for Dianzhang Chen <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     dianzhangchen0@...il.com, hpa@...or.com, mingo@...nel.org,
        linux-kernel@...r.kernel.org, tglx@...utronix.de
Subject: [tip:x86/pti] x86/tls: Fix possible spectre-v1 in
 do_get_thread_area()

Commit-ID:  993773d11d45c90cb1c6481c2638c3d9f092ea5b
Gitweb:     https://git.kernel.org/tip/993773d11d45c90cb1c6481c2638c3d9f092ea5b
Author:     Dianzhang Chen <dianzhangchen0@...il.com>
AuthorDate: Wed, 26 Jun 2019 12:50:30 +0800
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 27 Jun 2019 23:48:04 +0200

x86/tls: Fix possible spectre-v1 in do_get_thread_area()

The index to access the threads tls array is controlled by userspace
via syscall: sys_ptrace(), hence leading to a potential exploitation
of the Spectre variant 1 vulnerability.

The index can be controlled from:
        ptrace -> arch_ptrace -> do_get_thread_area.

Fix this by sanitizing the user supplied index before using it to access
the p->thread.tls_array.

Signed-off-by: Dianzhang Chen <dianzhangchen0@...il.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: bp@...en8.de
Cc: hpa@...or.com
Cc: stable@...r.kernel.org
Link: https://lkml.kernel.org/r/1561524630-3642-1-git-send-email-dianzhangchen0@gmail.com

---
 arch/x86/kernel/tls.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index a5b802a12212..71d3fef1edc9 100644
--- a/arch/x86/kernel/tls.c
+++ b/arch/x86/kernel/tls.c
@@ -5,6 +5,7 @@
 #include <linux/user.h>
 #include <linux/regset.h>
 #include <linux/syscalls.h>
+#include <linux/nospec.h>
 
 #include <linux/uaccess.h>
 #include <asm/desc.h>
@@ -220,6 +221,7 @@ int do_get_thread_area(struct task_struct *p, int idx,
 		       struct user_desc __user *u_info)
 {
 	struct user_desc info;
+	int index;
 
 	if (idx == -1 && get_user(idx, &u_info->entry_number))
 		return -EFAULT;
@@ -227,8 +229,11 @@ int do_get_thread_area(struct task_struct *p, int idx,
 	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
 		return -EINVAL;
 
-	fill_user_desc(&info, idx,
-		       &p->thread.tls_array[idx - GDT_ENTRY_TLS_MIN]);
+	index = idx - GDT_ENTRY_TLS_MIN;
+	index = array_index_nospec(index,
+			GDT_ENTRY_TLS_MAX - GDT_ENTRY_TLS_MIN + 1);
+
+	fill_user_desc(&info, idx, &p->thread.tls_array[index]);
 
 	if (copy_to_user(u_info, &info, sizeof(info)))
 		return -EFAULT;