diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 12:23:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 12:23:00 -0700 |
commit | 223cea6a4f0552b86fb25e3b8bbd00469816cd7a (patch) | |
tree | b1470f93d7b9b996634f1be7fbee2d924aba6f0d /arch/x86/kernel/ptrace.c | |
parent | 2f0f6503e37551eb8d8d5e4d27c78d28a30fed5a (diff) | |
parent | 993773d11d45c90cb1c6481c2638c3d9f092ea5b (diff) | |
download | linux-stable-223cea6a4f0552b86fb25e3b8bbd00469816cd7a.tar.gz linux-stable-223cea6a4f0552b86fb25e3b8bbd00469816cd7a.tar.bz2 linux-stable-223cea6a4f0552b86fb25e3b8bbd00469816cd7a.zip |
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 pti updates from Thomas Gleixner:
"The speculative paranoia departement delivers a few more plugs for
possible (probably theoretical) spectre/mds leaks"
* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tls: Fix possible spectre-v1 in do_get_thread_area()
x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
x86/speculation/mds: Eliminate leaks by trace_hardirqs_on()
Diffstat (limited to 'arch/x86/kernel/ptrace.c')
-rw-r--r-- | arch/x86/kernel/ptrace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 53f34121fdca..ee9099061d01 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -25,6 +25,7 @@ #include <linux/rcupdate.h> #include <linux/export.h> #include <linux/context_tracking.h> +#include <linux/nospec.h> #include <linux/uaccess.h> #include <asm/pgtable.h> @@ -635,7 +636,8 @@ static unsigned long ptrace_get_debugreg(struct task_struct *tsk, int n) unsigned long val = 0; if (n < HBP_NUM) { - struct perf_event *bp = thread->ptrace_bps[n]; + int index = array_index_nospec(n, HBP_NUM); + struct perf_event *bp = thread->ptrace_bps[index]; if (bp) val = bp->hw.info.address; |