Skip to contentSkip to conversation

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

PATCH Superseded Dianzhang Chen 2 participants 3 messages Jun 25, 2019 – Jun 26, 2019 x86

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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 idx can be controlled from:

        ptrace -> arch_ptrace -> do_get_thread_area.

Fix this by sanitizing idx before using it to index p->thread.tls_array.

---
 arch/x86/kernel/tls.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/tls.c +5 -2
index a5b802a..424cff5 100644
@@ -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,9 @@ 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;
+
+	fill_user_desc(&info, idx, &p->thread.tls_array[index]);
 
 	if (copy_to_user(u_info, &info, sizeof(info)))
 		return -EFAULT;
Signature · 1 line
2.7.4
#1 lore raw
Quoted 7 lines · Dianzhang Chen

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 idx can be controlled from:

        ptrace -> arch_ptrace -> do_get_thread_area.

Fix this by sanitizing idx before using it to index p->thread.tls_array.

Just that I can't find a place which sanitizes the value....

Quoted 1 line

+#include <linux/nospec.h>

and nothing which uses anything from this header file.

Quoted 11 lines

#include <linux/uaccess.h>
#include <asm/desc.h>

arch/x86/kernel/tls.c +1 -0
@@ -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;

arch/x86/kernel/tls.c int do_get_thread_area(struct task_struct *p, int idx, · line 234

Quoted 8 lines
arch/x86/kernel/tls.c +3 -2
@@ -227,8 +229,9 @@ 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;
+
+	fill_user_desc(&info, idx, &p->thread.tls_array[index]);

So this is just a cosmetic change and the compiler will create probably exactly the same binary.

Thanks,

tglx

#2 lore raw
Quoted 40 lines · Thomas Gleixner
Quoted 7 lines · Dianzhang Chen

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 idx can be controlled from:

        ptrace -> arch_ptrace -> do_get_thread_area.

Fix this by sanitizing idx before using it to index p->thread.tls_array.

Just that I can't find a place which sanitizes the value....

Quoted 1 line

+#include <linux/nospec.h>

and nothing which uses anything from this header file.

Quoted 11 lines

#include <linux/uaccess.h>
#include <asm/desc.h>

arch/x86/kernel/tls.c +1 -0
@@ -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;

arch/x86/kernel/tls.c int do_get_thread_area(struct task_struct *p, int idx, · line 234

Quoted 8 lines
arch/x86/kernel/tls.c +3 -2
@@ -227,8 +229,9 @@ 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;
+
+     fill_user_desc(&info, idx, &p->thread.tls_array[index]);

So this is just a cosmetic change and the compiler will create probably exactly the same binary.

Quoted 4 lines

Thanks,

tglx

sorry for being careless, my bad.
And thanks for suggestion, i'll fix that in next version.