x86/alternative: Align insn bytes vertically
Borislav Petkov
maintainerPATCH 1/1 x86/alternative: Align insn bytes vertically
From: Borislav Petkov <[email protected]>
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.
--- arch/x86/kernel/alternative.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/alternative.c +2 -2
@@ -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;
Signature · 1 line
2.29.2
Quoted 6 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
For easier inspection which bytes have changed.
For example:
Quoted 8 lines
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 c3No functional changes.
Signed-off-by Borislav Petkov <[email protected]>
Nice!
The following commit has been merged into the x86/cleanups branch of tip:
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 <[email protected]> AuthorDate: Tue, 01 Jun 2021 21:30:56 +02:00 Committer: Borislav Petkov <[email protected]> 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.
--- arch/x86/kernel/alternative.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/alternative.c +2 -2
@@ -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;