The following commit has been merged into the x86/core branch of tip: Commit-ID: 0be7f42d6fcce111f487283d596594c6da6588b0 Gitweb: https://git.kernel.org/tip/0be7f42d6fcce111f487283d596594c6da6588b0 Author: Borislav Petkov <b...@suse.de> AuthorDate: Mon, 16 Nov 2020 18:38:45 +01:00 Committer: Borislav Petkov <b...@suse.de> CommitterDate: Mon, 15 Mar 2021 12:00:18 +01:00
x86/traps: Convert to insn_decode() Simplify code, no functional changes. Signed-off-by: Borislav Petkov <b...@suse.de> Link: https://lkml.kernel.org/r/20210304174237.31945-15...@alien8.de --- arch/x86/kernel/traps.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index ac1874a..0da8d2a 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -498,14 +498,15 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs, { u8 insn_buf[MAX_INSN_SIZE]; struct insn insn; + int ret; if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip, MAX_INSN_SIZE)) return GP_NO_HINT; - kernel_insn_init(&insn, insn_buf, MAX_INSN_SIZE); - insn_get_modrm(&insn); - insn_get_sib(&insn); + ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN); + if (ret < 0) + return GP_NO_HINT; *addr = (unsigned long)insn_get_addr_ref(&insn, regs); if (*addr == -1UL)
