diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-12 11:13:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-12 11:13:15 -0700 |
| commit | 1e6d1d96461eb350a98c1a0fe9fd93ea14a157e8 (patch) | |
| tree | e8aaa4ebc95092893ef1e0668a7f37ad45d961b8 | |
| parent | 64743e652cea9d6df4264caaa1d7f95273024afb (diff) | |
| parent | 238c91115cd05c71447ea071624a4c9fe661f970 (diff) | |
| download | linux-1e6d1d96461eb350a98c1a0fe9fd93ea14a157e8.tar.bz2 | |
Merge tag 'x86_core_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Borislav Petkov:
"A single fix making the error message when the opcode bytes at rIP
cannot be accessed during an oops, more precise"
* tag 'x86_core_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/dumpstack: Fix misleading instruction pointer error message
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 48ce44576947..ea8d51ec251b 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -115,7 +115,8 @@ void show_opcodes(struct pt_regs *regs, const char *loglvl) unsigned long prologue = regs->ip - PROLOGUE_SIZE; if (copy_code(regs, opcodes, prologue, sizeof(opcodes))) { - printk("%sCode: Bad RIP value.\n", loglvl); + printk("%sCode: Unable to access opcode bytes at RIP 0x%lx.\n", + loglvl, prologue); } else { printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %" __stringify(EPILOGUE_SIZE) "ph\n", loglvl, opcodes, |