From: "tip-bot2 for Brian Gerst" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Brian Gerst <brgerst@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@alien8.de>,
Denys Vlasenko <dvlasenk@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Uros Bizjak <ubizjak@gmail.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/entry] x86/entry/64: Use TASK_SIZE_MAX for canonical RIP test
Date: Fri, 13 Oct 2023 11:18:27 -0000 [thread overview]
Message-ID: <169719590716.3135.10309736631158969894.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231011224351.130935-3-brgerst@gmail.com>
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 58978b44df7276f7c75a2c6aad6c201421cd4daa
Gitweb: https://git.kernel.org/tip/58978b44df7276f7c75a2c6aad6c201421cd4daa
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Wed, 11 Oct 2023 18:43:50 -04:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 13 Oct 2023 13:05:28 +02:00
x86/entry/64: Use TASK_SIZE_MAX for canonical RIP test
Using shifts to determine if an address is canonical is difficult for
the compiler to optimize when the virtual address width is variable
(LA57 feature) without using inline assembly. Instead, compare RIP
against TASK_SIZE_MAX. The only user executable address outside of that
range is the deprecated vsyscall page, which can fall back to using IRET.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Uros Bizjak <ubizjak@gmail.com>
Link: https://lore.kernel.org/r/20231011224351.130935-3-brgerst@gmail.com
---
arch/x86/entry/common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 9021465..4c7154d 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -110,10 +110,10 @@ __visible noinstr bool do_syscall_64(struct pt_regs *regs, int nr)
* in kernel space. This essentially lets the user take over
* the kernel, since userspace controls RSP.
*
- * Change top bits to match the most significant bit (47th or 56th bit
- * depending on paging mode) in the address.
+ * TASK_SIZE_MAX covers all user-accessible addresses other than
+ * the deprecated vsyscall page.
*/
- if (unlikely(!__is_canonical_address(regs->ip, __VIRTUAL_MASK_SHIFT + 1)))
+ if (unlikely(regs->ip >= TASK_SIZE_MAX))
return false;
/*
next prev parent reply other threads:[~2023-10-13 11:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 22:43 [PATCH v3 0/3] x86: Clean up fast syscall return validation Brian Gerst
2023-10-11 22:43 ` [PATCH v3 1/3] x86/entry/64: Convert SYSRET validation tests to C Brian Gerst
2023-10-13 11:18 ` [tip: x86/entry] " tip-bot2 for Brian Gerst
2023-10-13 12:39 ` [PATCH v3 1/3] " Nikolay Borisov
2023-10-13 13:05 ` Brian Gerst
2023-10-11 22:43 ` [PATCH v3 2/3] x86/entry/64: Use TASK_SIZE_MAX for canonical RIP test Brian Gerst
2023-10-13 11:18 ` tip-bot2 for Brian Gerst [this message]
2023-10-11 22:43 ` [PATCH v3 3/3] x86/entry/32: Clean up syscall fast exit tests Brian Gerst
2023-10-13 11:18 ` [tip: x86/entry] " tip-bot2 for Brian Gerst
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=169719590716.3135.10309736631158969894.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=ubizjak@gmail.com \
--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®