diff options
| author | Borislav Petkov <bp@suse.de> | 2020-11-16 18:38:45 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-03-15 12:00:18 +0100 |
| commit | 0be7f42d6fcce111f487283d596594c6da6588b0 (patch) | |
| tree | 6e088b3b2cee5b1a395eb3617c1bf25ef80787b1 /arch/x86/kernel/traps.c | |
| parent | 5e32c64bb6912bdddc05216655dd37e848b717af (diff) | |
| download | linux-0be7f42d6fcce111f487283d596594c6da6588b0.tar.bz2 | |
x86/traps: Convert to insn_decode()
Simplify code, no functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210304174237.31945-15-bp@alien8.de
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index ac1874a2a70e..0da8d2a889cb 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) |