summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2025-04-11 08:40:37 +0300
committerIngo Molnar <mingo@kernel.org>2025-04-11 12:01:34 +0300
commit476ad071c678d70623cdb14fadd21818f64cc45b (patch)
tree76a023caf6d29ffa623a6ab9122b86f6ab81fb4d
parentc8976ade0c1b4c0629b8a080d712ff402e8343b3 (diff)
downloadlinux-476ad071c678d70623cdb14fadd21818f64cc45b.tar.xz
x86/alternatives: Assert that smp_text_poke_int3_handler() can only ever handle 'tp_vec[]' based requests
Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Juergen Gross <jgross@suse.com> Cc: "H . Peter Anvin" <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20250411054105.2341982-26-mingo@kernel.org
-rw-r--r--arch/x86/kernel/alternative.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index b4cb8676c2f0..329f6ee6b3bc 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2510,6 +2510,10 @@ static __always_inline int patch_cmp(const void *key, const void *elt)
return 0;
}
+#define TP_VEC_MAX (PAGE_SIZE / sizeof(struct smp_text_poke_loc))
+static struct smp_text_poke_loc tp_vec[TP_VEC_MAX];
+static int tp_vec_nr;
+
noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)
{
struct text_poke_int3_vec *desc;
@@ -2534,6 +2538,8 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)
if (!desc)
return 0;
+ WARN_ON_ONCE(desc->vec != tp_vec);
+
/*
* Discount the INT3. See smp_text_poke_batch_process().
*/
@@ -2592,10 +2598,6 @@ out_put:
return ret;
}
-#define TP_VEC_MAX (PAGE_SIZE / sizeof(struct smp_text_poke_loc))
-static struct smp_text_poke_loc tp_vec[TP_VEC_MAX];
-static int tp_vec_nr;
-
/**
* smp_text_poke_batch_process() -- update instructions on live kernel on SMP
* @tp: vector of instructions to patch