From: Peter Zijlstra <peterz@infradead.org>
To: linux-kernel@vger.kernel.org
Cc: linux-tip-commits@vger.kernel.org,
Nikunj A Dadhania <nikunj@amd.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Sohil Mehta <sohil.mehta@intel.com>,
stable@vger.kernel.org, x86@kernel.org,
Kees Cook <keescook@chromium.org>
Subject: Re: [tip: x86/urgent] x86/cpu: Disable CR pinning during CPU bringup
Date: Wed, 18 Mar 2026 23:09:39 +0100 [thread overview]
Message-ID: <20260318220939.GD3739106@noisy.programming.kicks-ass.net> (raw)
In-Reply-To: <20260318204722.GD3738786@noisy.programming.kicks-ass.net>
On Wed, Mar 18, 2026 at 09:47:22PM +0100, Peter Zijlstra wrote:
> On Wed, Mar 18, 2026 at 06:51:10PM -0000, tip-bot2 for Dave Hansen wrote:
> > --- a/arch/x86/kernel/cpu/common.c
> > +++ b/arch/x86/kernel/cpu/common.c
> > @@ -437,6 +437,21 @@ static const unsigned long cr4_pinned_mask = X86_CR4_SMEP | X86_CR4_SMAP | X86_C
> > static DEFINE_STATIC_KEY_FALSE_RO(cr_pinning);
> > static unsigned long cr4_pinned_bits __ro_after_init;
> >
> > +static bool cr_pinning_enabled(void)
> > +{
> > + if (!static_branch_likely(&cr_pinning))
> > + return false;
> > +
> > + /*
> > + * Do not enforce pinning during CPU bringup. It might
> > + * turn on features that are not set up yet, like FRED.
> > + */
> > + if (!cpu_online(smp_processor_id()))
> > + return false;
> > +
> > + return true;
> > +}
>
> Urgh, so this means all an attack needs to do is disable the online bit
> and it gets to poke CR4 bits.
>
> This seems unfortunate.
>
> And sure, randomly clearing the online bit will eventually cause havoc,
> but I suspect you still get plenty time until the system goes wobbly.
The below tries to explain the CR pinning; and shows how the above
effectively disables the entire scheme since the online bit lives in RW
memory.
That is, the sequence:
clear online bit
ROP into 'mov %reg, %CR4'
(re)set online bit
is fairly trivial, all things considering.
---
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index bb937bc4b00f..994e09d8c2fb 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -450,6 +450,19 @@ late_initcall(cpu_finalize_pre_userspace);
/* These bits should not change their value after CPU init is finished. */
static const unsigned long cr4_pinned_mask = X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_UMIP |
X86_CR4_FSGSBASE | X86_CR4_CET | X86_CR4_FRED;
+
+/*
+ * The CR pinning protects against ROP on the 'mov %reg, %CRn' instruction(s).
+ * Since you can ROP directly to these instructions (barring shadow stack),
+ * any protection must follow immediately and unconditionally after that.
+ *
+ * Specifically, the CR[04] write functions below will have the value
+ * validation controlled by the @cr_pinning static_branch which is
+ * __ro_after_init, just like the cr4_pinned_bits value.
+ *
+ * Once set, an attacker will have to defeat page-tables to get around these
+ * restrictions. Which is a much bigger ask than 'simple' ROP.
+ */
static DEFINE_STATIC_KEY_FALSE_RO(cr_pinning);
static unsigned long cr4_pinned_bits __ro_after_init;
next prev parent reply other threads:[~2026-03-18 22:16 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-18 7:56 [PATCH v3 0/3] x86/fred: Fix SEV-ES/SNP guest boot failures Nikunj A Dadhania
2026-03-18 7:56 ` [PATCH v3 1/3] x86/cpu: Enable FSGSBASE early in cpu_init_exception_handling() Nikunj A Dadhania
2026-03-18 13:54 ` Sohil Mehta
2026-03-18 15:39 ` Borislav Petkov
2026-03-18 15:53 ` Dave Hansen
2026-03-18 16:49 ` Sohil Mehta
2026-03-18 18:51 ` [tip: x86/urgent] " tip-bot2 for Nikunj A Dadhania
2026-03-23 13:58 ` tip-bot2 for Nikunj A Dadhania
2026-03-18 7:56 ` [PATCH v3 2/3] x86/cpu: Disable CR pinning during CPU bringup Nikunj A Dadhania
2026-03-18 18:51 ` [tip: x86/urgent] " tip-bot2 for Dave Hansen
2026-03-18 20:47 ` Peter Zijlstra
2026-03-18 21:08 ` Borislav Petkov
2026-03-18 21:30 ` Peter Zijlstra
2026-03-18 22:01 ` Borislav Petkov
2026-03-18 21:09 ` Peter Zijlstra
2026-03-18 21:30 ` Dave Hansen
2026-03-18 22:09 ` Peter Zijlstra [this message]
2026-03-20 9:25 ` [PATCH] x86/cpu: Add comment clarifying CRn pinning Peter Zijlstra
2026-03-20 11:34 ` Borislav Petkov
2026-03-23 13:58 ` [tip: x86/urgent] " tip-bot2 for Peter Zijlstra
2026-03-18 7:56 ` [PATCH v3 3/3] x86/fred: Fix early boot failures on SEV-ES/SNP guests Nikunj A Dadhania
2026-03-18 18:51 ` [tip: x86/urgent] " tip-bot2 for Nikunj A Dadhania
2026-03-23 13:58 ` tip-bot2 for Nikunj A Dadhania
2026-03-18 11:43 ` [PATCH v3 0/3] x86/fred: Fix SEV-ES/SNP guest boot failures Borislav Petkov
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=20260318220939.GD3739106@noisy.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=nikunj@amd.com \
--cc=sohil.mehta@intel.com \
--cc=stable@vger.kernel.org \
--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®