xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/alternative: Use insn_decode()

Browse Source 
commit 63c66cde7bbcc79aac14b25861c5b2495eede57b upstream.

No functional changes, just simplification.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210304174237.31945-10-bp@alien8.de
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Borislav Petkov
2020-11-06 19:37:25 +01:00
committed by Greg Kroah-Hartman
parent e6f8dc86a1
commit d9cd219114
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/alternative.c
View File

@@ -1284,15 +1284,15 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr,
const void *opcode, size_t len, const void *emulate) const void *opcode, size_t len, const void *emulate)
{ {
struct insn insn; struct insn insn;
int ret;
memcpy((void *)tp->text, opcode, len); memcpy((void *)tp->text, opcode, len);
if (!emulate) if (!emulate)
emulate = opcode; emulate = opcode;
kernel_insn_init(&insn, emulate, MAX_INSN_SIZE); ret = insn_decode(&insn, emulate, MAX_INSN_SIZE, INSN_MODE_KERN);
insn_get_length(&insn);
BUG_ON(!insn_complete(&insn)); BUG_ON(ret < 0);
BUG_ON(len != insn.length); BUG_ON(len != insn.length);
tp->rel_addr = addr - (void *)_stext; tp->rel_addr = addr - (void *)_stext;