mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dianzhang Chen <dianzhangchen0@gmail.com>
To: tglx@linutronix.de
Cc: mingo@redhat.com, bp@alien8.de, hpa@zytor.com, x86@kernel.org,
	linux-kernel@vger.kernel.org,
	Dianzhang Chen <dianzhangchen0@gmail.com>
Subject: [PATCH v2] x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
Date: Tue, 25 Jun 2019 23:30:17 +0800	[thread overview]
Message-ID: <1561476617-3759-1-git-send-email-dianzhangchen0@gmail.com> (raw)

The index to access the threads ptrace_bps is controlled by userspace
via syscall: sys_ptrace(), hence, hence leading to a potential
exploitation of the Spectre variant 1 vulnerability.
The n can be controlled from:
    ptrace -> arch_ptrace -> ptrace_get_debugreg.

Fix this by sanitizing n before using it to index thread->ptrace_bps.

Signed-off-by: Dianzhang Chen <dianzhangchen0@gmail.com>
---
 arch/x86/kernel/ptrace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index a166c96..cbac646 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>
@@ -643,9 +644,11 @@ static unsigned long ptrace_get_debugreg(struct task_struct *tsk, int n)
 {
 	struct thread_struct *thread = &tsk->thread;
 	unsigned long val = 0;
+	int index = n;
 
 	if (n < HBP_NUM) {
-		struct perf_event *bp = thread->ptrace_bps[n];
+		index = array_index_nospec(index, HBP_NUM);
+		struct perf_event *bp = thread->ptrace_bps[index];
 
 		if (bp)
 			val = bp->hw.info.address;
-- 
2.7.4


             reply	other threads:[~2019-06-25 15:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-25 15:30 Dianzhang Chen [this message]
2019-06-27 21:52 ` [tip:x86/pti] " tip-bot for Dianzhang Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1561476617-3759-1-git-send-email-dianzhangchen0@gmail.com \
    --to=dianzhangchen0@gmail.com \
    --cc=bp@alien8.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®