[tip: x86/cleanups] x86/alternative: Align insn bytes vertically
From: tip-bot2 for Borislav Petkov
Date: Thu Jun 03 2021 - 08:31:03 EST
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 7ee0e638a526b2d1f09c714f86d82dfd7628f322
Gitweb: https://git.kernel.org/tip/7ee0e638a526b2d1f09c714f86d82dfd7628f322
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Tue, 01 Jun 2021 21:30:56 +02:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Thu, 03 Jun 2021 14:24:44 +02:00
x86/alternative: Align insn bytes vertically
For easier inspection which bytes have changed.
For example:
feat: 7*32+12, old: (__x86_indirect_thunk_r10+0x0/0x20 (ffffffff81c02480) len: 17), repl: (ffffffff897813aa, len: 17)
ffffffff81c02480: old_insn: 41 ff e2 90 90 90 90 90 90 90 90 90 90 90 90 90 90
ffffffff897813aa: rpl_insn: e8 07 00 00 00 f3 90 0f ae e8 eb f9 4c 89 14 24 c3
ffffffff81c02480: final_insn: e8 07 00 00 00 f3 90 0f ae e8 eb f9 4c 89 14 24 c3
No functional changes.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20210601193713.16190-1-bp@xxxxxxxxx
---
arch/x86/kernel/alternative.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 75c752b..227c4a8 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -273,8 +273,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
instr, instr, a->instrlen,
replacement, a->replacementlen);
- DUMP_BYTES(instr, a->instrlen, "%px: old_insn: ", instr);
- DUMP_BYTES(replacement, a->replacementlen, "%px: rpl_insn: ", replacement);
+ DUMP_BYTES(instr, a->instrlen, "%px: old_insn: ", instr);
+ DUMP_BYTES(replacement, a->replacementlen, "%px: rpl_insn: ", replacement);
memcpy(insn_buff, replacement, a->replacementlen);
insn_buff_sz = a->replacementlen;