From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH v4 01/18] x86/alternative: Support alt_replace_call() with instructions after call
Date: Mon, 29 Jun 2026 08:55:27 +0200 [thread overview]
Message-ID: <20260629065544.3643253-2-jgross@suse.com> (raw)
In-Reply-To: <20260629065544.3643253-1-jgross@suse.com>
Today alt_replace_call() requires the initial indirect call not to be
followed by any further instructions, including padding NOPs. In case
any replacement is longer than 6 bytes, a subsequent replacement of
the indirect call with a direct one will result in a crash.
Fix that by crashing only if the original instruction is less than
6 bytes long or not a known indirect call.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/kernel/alternative.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 62936a3bde19..2f24c3e9c0c0 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -534,6 +534,7 @@ noinstr void BUG_func(void)
}
EXPORT_SYMBOL(BUG_func);
+#define CALL_RIP_INSTRLEN 6
#define CALL_RIP_REL_OPCODE 0xff
#define CALL_RIP_REL_MODRM 0x15
@@ -551,7 +552,7 @@ static unsigned int alt_replace_call(u8 *instr, u8 *insn_buff, struct alt_instr
BUG();
}
- if (a->instrlen != 6 ||
+ if (a->instrlen < CALL_RIP_INSTRLEN ||
instr[0] != CALL_RIP_REL_OPCODE ||
instr[1] != CALL_RIP_REL_MODRM) {
pr_err("ALT_FLAG_DIRECT_CALL set for unrecognized indirect call\n");
@@ -563,7 +564,7 @@ static unsigned int alt_replace_call(u8 *instr, u8 *insn_buff, struct alt_instr
#ifdef CONFIG_X86_64
/* ff 15 00 00 00 00 call *0x0(%rip) */
/* target address is stored at "next instruction + disp". */
- target = *(void **)(instr + a->instrlen + disp);
+ target = *(void **)(instr + CALL_RIP_INSTRLEN + disp);
#else
/* ff 15 00 00 00 00 call *0x0 */
/* target address is stored at disp. */
--
2.54.0
next prev parent reply other threads:[~2026-06-29 6:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-29 6:55 [PATCH v4 00/18] x86/msr: Inline rdmsr/wrmsr instructions Juergen Gross
2026-06-29 6:55 ` Juergen Gross [this message]
2026-06-29 6:55 ` [PATCH v4 02/18] coco/tdx: Rename MSR access helpers Juergen Gross
2026-06-29 6:55 ` [PATCH v4 03/18] KVM: x86: Remove the KVM private read_msr() function Juergen Gross
2026-06-29 6:55 ` [PATCH v4 04/18] x86/msr: Minimize usage of native_*() msr access functions Juergen Gross
2026-06-29 6:55 ` [PATCH v4 05/18] x86/msr: Move MSR trace calls one function level up Juergen Gross
2026-06-29 6:55 ` [PATCH v4 06/18] x86/hyperv: Switch from __rdmsr() to native_rdmsrq() Juergen Gross
2026-06-29 6:55 ` [PATCH v4 07/18] x86/opcode: Add immediate form MSR instructions Juergen Gross
2026-06-29 6:55 ` [PATCH v4 08/18] x86/extable: Add support for " Juergen Gross
2026-06-29 17:04 ` H. Peter Anvin
2026-06-30 6:42 ` Jürgen Groß
2026-06-29 6:55 ` [PATCH v4 09/18] x86/msr: Make wrmsrns() a first class citizen Juergen Gross
2026-06-29 6:55 ` [PATCH v4 10/18] x86/msr: Introduce sync_cpu_after_wrmsrns() Juergen Gross
2026-06-29 6:55 ` [PATCH v4 11/18] x86/msr: Use the alternatives mechanism for RDMSR Juergen Gross
2026-06-29 6:55 ` [PATCH v4 12/18] x86/alternatives: Add ALTERNATIVE_4() Juergen Gross
2026-06-29 6:55 ` [PATCH v4 13/18] x86/paravirt: Split off MSR related hooks into new header Juergen Gross
2026-06-29 6:55 ` [PATCH v4 14/18] x86/paravirt: Prepare support of MSR instruction interfaces Juergen Gross
2026-06-29 6:55 ` [PATCH v4 15/18] x86/paravirt: Switch MSR access pv_ops functions to " Juergen Gross
2026-06-29 6:55 ` [PATCH v4 16/18] x86/msr: Reduce number of low level MSR access helpers Juergen Gross
2026-06-29 6:55 ` [PATCH v4 17/18] x86/paravirt: Use alternatives for MSR access with paravirt Juergen Gross
2026-06-29 6:55 ` [PATCH v4 18/18] x86/msr: Make all MSR access functions __always_inline Juergen Gross
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=20260629065544.3643253-2-jgross@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@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®