mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for David Woodhouse" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Nathan Chancellor <nathan@kernel.org>,
	David Woodhouse <dwmw@amazon.co.uk>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/boot] x86/kexec: Mark machine_kexec() with __nocfi
Date: Wed, 15 Jan 2025 09:17:52 -0000	[thread overview]
Message-ID: <173693267219.31546.15758183573184177131.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250109140757.2841269-7-dwmw2@infradead.org>

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     2114796ca041f0d3e79e5dd165219b940b23c540
Gitweb:        https://git.kernel.org/tip/2114796ca041f0d3e79e5dd165219b940b23c540
Author:        David Woodhouse <dwmw@amazon.co.uk>
AuthorDate:    Thu, 09 Jan 2025 14:04:18 
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 14 Jan 2025 13:02:40 +01:00

x86/kexec: Mark machine_kexec() with __nocfi

A recent commit caused the relocate_kernel() function to be invoked through
a function pointer, but it does not have CFI information. The resulting trap
occurs after the IDT and GDT have been invalidated, leading to a triple-fault
if CONFIG_CFI_CLANG is enabled.

Using SYM_TYPED_FUNC_START() to provide the CFI information looks like it will
require a prolonged battle with objtool. And is fairly pointless anyway, as
the actual signature comes from a __kcfi_typeid_… symbol emitted from the
C code based on the function prototype it thinks that relocate_kernel has,
rendering the check somewhat tautological.

The simple fix is just to mark machine_kexec() with __nocfi.

Fixes: eeebbde57113 ("x86/kexec: Invoke copy of relocate_kernel() instead of the original")
Reported-by: Nathan Chancellor <nathan@kernel.org>
Suggested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20250109140757.2841269-7-dwmw2@infradead.org
---
 arch/x86/kernel/machine_kexec_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 9232ad1..1440f79 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -342,7 +342,7 @@ void machine_kexec_cleanup(struct kimage *image)
  * Do not allocate memory (or fail in any way) in machine_kexec().
  * We are past the point of no return, committed to rebooting now.
  */
-void machine_kexec(struct kimage *image)
+void __nocfi machine_kexec(struct kimage *image)
 {
 	unsigned long (*relocate_kernel_ptr)(unsigned long indirection_page,
 					     unsigned long pa_control_page,

  reply	other threads:[~2025-01-15  9:17 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-09 14:04 [PATCH v2 0/9] x86/kexec: Fixes for tip/x86/boot David Woodhouse
2025-01-09 14:04 ` [PATCH v2 1/9] x86/kexec: Disable global pages before writing to control page David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 2/9] x86/kexec: Ensure preserve_context flag is set on return to kernel David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 3/9] x86/kexec: Use correct swap page in swap_pages function David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 4/9] x86/kexec: Fix stack and handling of re-entry point for ::preserve_context David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 5/9] x86/kexec: Fix location of relocate_kernel with -ffunction-sections David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for Nathan Chancellor
2025-01-09 14:04 ` [PATCH v2 6/9] x86/kexec: Mark machine_kexec() with __nocfi David Woodhouse
2025-01-15  9:17   ` tip-bot2 for David Woodhouse [this message]
2025-01-09 14:04 ` [PATCH v2 7/9] kexec_core: Add and update comments regarding the KEXEC_JUMP flow David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for Rafael J. Wysocki
2025-01-09 14:04 ` [PATCH v2 8/9] x86/kexec: Cope with relocate_kernel() not being at the start of the page David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 9/9] x86/kexec: Use typedef for relocate_kernel_fn function prototype David Woodhouse
2025-01-15  9:17   ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-14 11:34 ` [PATCH v2 0/9] x86/kexec: Fixes for tip/x86/boot David Woodhouse
2025-01-14 11:51   ` Borislav Petkov
2025-01-14 11:53     ` David Woodhouse
2025-01-14 12:11       ` 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=173693267219.31546.15758183573184177131.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=dwmw@amazon.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=nathan@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®