]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
x86/alternatives: Assert that smp_text_poke_int3_handler() can only ever handle ...
authorIngo Molnar <mingo@kernel.org>
Fri, 11 Apr 2025 05:40:37 +0000 (07:40 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 11 Apr 2025 09:01:34 +0000 (11:01 +0200)
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
arch/x86/kernel/alternative.c

index b4cb8676c2f042ba70ce507210b906a0306bd410..329f6ee6b3bc2f269ddf270341089467e10ba9d0 100644 (file)
@@ -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