diff options
| author | Joerg Roedel <jroedel@suse.de> | 2021-06-14 15:53:26 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-06-15 11:39:30 +0200 |
| commit | 4aaa7eacd7cc7c10f269c7f2a01d044b375bed8e (patch) | |
| tree | e5b872baed73de2090cde3ac4a696bbfe9c20ab1 /arch/x86/kernel/umip.c | |
| parent | x86/insn-eval: Make 0 a valid RIP for insn_get_effective_ip() (diff) | |
| download | linux-4aaa7eacd7cc7c10f269c7f2a01d044b375bed8e.tar.xz linux-4aaa7eacd7cc7c10f269c7f2a01d044b375bed8e.zip | |
x86/insn: Extend error reporting from insn_fetch_from_user[_inatomic]()
The error reporting from the insn_fetch_from_user*() functions is not
very verbose. Extend it to include information on whether the linear
RIP could not be calculated or whether the memory access faulted.
This will be used in the SEV-ES code to propagate the correct
exception depending on what went wrong during instruction fetch.
[ bp: Massage comments. ]
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210614135327.9921-6-joro@8bytes.org
Diffstat (limited to 'arch/x86/kernel/umip.c')
| -rw-r--r-- | arch/x86/kernel/umip.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/kernel/umip.c b/arch/x86/kernel/umip.c index 8daa70b0d2da..576b47e7523d 100644 --- a/arch/x86/kernel/umip.c +++ b/arch/x86/kernel/umip.c @@ -346,14 +346,12 @@ bool fixup_umip_exception(struct pt_regs *regs) if (!regs) return false; - nr_copied = insn_fetch_from_user(regs, buf); - /* - * The insn_fetch_from_user above could have failed if user code - * is protected by a memory protection key. Give up on emulation - * in such a case. Should we issue a page fault? + * Give up on emulation if fetching the instruction failed. Should a + * page fault or a #GP be issued? */ - if (!nr_copied) + nr_copied = insn_fetch_from_user(regs, buf); + if (nr_copied <= 0) return false; if (!insn_decode_from_regs(&insn, regs, buf, nr_copied)) |