diff options
| author | Peter Zijlstra <[email protected]> | 2019-11-11 14:08:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2019-11-27 07:44:25 +0100 |
| commit | 76ffa7204b1ad7d321ac3a0292fdf3975d14866b (patch) | |
| tree | 9ae15465eef25f24c1f810db6929590202333b6c | |
| parent | f2cb4f95b7571f2bebcf226cd92b448fd58950ca (diff) | |
x86/alternatives: Use INT3_INSN_SIZE
Use INT3_INSN_SIZE instead of sizeof(int3).
Suggested-by: Ingo Molnar <[email protected]>
Tested-by: Alexei Starovoitov <[email protected]>
Tested-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Acked-by: Alexei Starovoitov <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | arch/x86/kernel/alternative.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 6455902e3b44..4552795a8df4 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1088,7 +1088,7 @@ static void text_poke_bp_batch(struct text_poke_loc *tp, unsigned int nr_entries * First step: add a int3 trap to the address that will be patched. */ for (i = 0; i < nr_entries; i++) - text_poke(text_poke_addr(&tp[i]), &int3, sizeof(int3)); + text_poke(text_poke_addr(&tp[i]), &int3, INT3_INSN_SIZE); text_poke_sync(); @@ -1098,10 +1098,10 @@ static void text_poke_bp_batch(struct text_poke_loc *tp, unsigned int nr_entries for (do_sync = 0, i = 0; i < nr_entries; i++) { int len = text_opcode_size(tp[i].opcode); - if (len - sizeof(int3) > 0) { - text_poke(text_poke_addr(&tp[i]) + sizeof(int3), - (const char *)tp[i].text + sizeof(int3), - len - sizeof(int3)); + if (len - INT3_INSN_SIZE > 0) { + text_poke(text_poke_addr(&tp[i]) + INT3_INSN_SIZE, + (const char *)tp[i].text + INT3_INSN_SIZE, + len - INT3_INSN_SIZE); do_sync++; } } @@ -1123,7 +1123,7 @@ static void text_poke_bp_batch(struct text_poke_loc *tp, unsigned int nr_entries if (tp[i].text[0] == INT3_INSN_OPCODE) continue; - text_poke(text_poke_addr(&tp[i]), tp[i].text, sizeof(int3)); + text_poke(text_poke_addr(&tp[i]), tp[i].text, INT3_INSN_SIZE); do_sync++; } |