The following commit has been merged into the x86/core branch of tip: Commit-ID: 63c66cde7bbcc79aac14b25861c5b2495eede57b Gitweb: https://git.kernel.org/tip/63c66cde7bbcc79aac14b25861c5b2495eede57b Author: Borislav Petkov <[email protected]> AuthorDate: Fri, 06 Nov 2020 19:37:25 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 15 Mar 2021 11:25:38 +01:00
x86/alternative: Use insn_decode() No functional changes, just simplification. Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected] --- arch/x86/kernel/alternative.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 8d778e4..ce28c5c 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1274,15 +1274,15 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr, const void *opcode, size_t len, const void *emulate) { struct insn insn; + int ret; memcpy((void *)tp->text, opcode, len); if (!emulate) emulate = opcode; - kernel_insn_init(&insn, emulate, MAX_INSN_SIZE); - insn_get_length(&insn); + ret = insn_decode(&insn, emulate, MAX_INSN_SIZE, INSN_MODE_KERN); - BUG_ON(!insn_complete(&insn)); + BUG_ON(ret < 0); BUG_ON(len != insn.length); tp->rel_addr = addr - (void *)_stext;
