Commit 8e6d1567 authored by Jann Horn's avatar Jann Horn Committed by Greg Kroah-Hartman
Browse files

x86/dumpstack: Don't dump kernel memory based on usermode RIP

commit 342db04a upstream.

show_opcodes() is used both for dumping kernel instructions and for dumping
user instructions. If userspace causes #PF by jumping to a kernel address,
show_opcodes() can be reached with regs->ip controlled by the user,
pointing to kernel code. Make sure that userspace can't trick us into
dumping kernel memory into dmesg.

Fixes: 7cccf072

 ("x86/dumpstack: Add a show_ip() function")
Signed-off-by: default avatarJann Horn <>
Signed-off-by: default avatarThomas Gleixner <>
Reviewed-by: default avatarKees Cook <>
Reviewed-by: default avatarBorislav Petkov <>
Cc: "H. Peter Anvin" <>
Cc: Andy Lutomirski <>

Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 6575b150
......@@ -111,6 +111,6 @@ static inline unsigned long caller_frame_pointer(void)
return (unsigned long)frame;
void show_opcodes(u8 *rip, const char *loglvl);
void show_opcodes(struct pt_regs *regs, const char *loglvl);
void show_ip(struct pt_regs *regs, const char *loglvl);
#endif /* _ASM_X86_STACKTRACE_H */
......@@ -92,23 +92,32 @@ static void printk_stack_address(unsigned long address, int reliable,
* Thus, the 2/3rds prologue and 64 byte OPCODE_BUFSIZE is just a random
* guesstimate in attempt to achieve all of the above.
void show_opcodes(u8 *rip, const char *loglvl)
void show_opcodes(struct pt_regs *regs, const char *loglvl)
unsigned int code_prologue = OPCODE_BUFSIZE * 2 / 3;
u8 opcodes[OPCODE_BUFSIZE];
u8 *ip;
unsigned long ip;
int i;
bool bad_ip;
printk("%sCode: ", loglvl);
ip = (u8 *)rip - code_prologue;
if (probe_kernel_read(opcodes, ip, OPCODE_BUFSIZE)) {
ip = regs->ip - code_prologue;
* Make sure userspace isn't trying to trick us into dumping kernel
* memory by pointing the userspace instruction pointer at it.
bad_ip = user_mode(regs) &&
__chk_range_not_ok(ip, OPCODE_BUFSIZE, TASK_SIZE_MAX);
if (bad_ip || probe_kernel_read(opcodes, (u8 *)ip, OPCODE_BUFSIZE)) {
pr_cont("Bad RIP value.\n");
for (i = 0; i < OPCODE_BUFSIZE; i++, ip++) {
if (ip == rip)
if (ip == regs->ip)
pr_cont("<%02x> ", opcodes[i]);
pr_cont("%02x ", opcodes[i]);
......@@ -123,7 +132,7 @@ void show_ip(struct pt_regs *regs, const char *loglvl)
printk("%sRIP: %04x:%pS\n", loglvl, (int)regs->cs, (void *)regs->ip);
show_opcodes((u8 *)regs->ip, loglvl);
show_opcodes(regs, loglvl);
void show_iret_regs(struct pt_regs *regs)
......@@ -838,7 +838,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,
printk(KERN_CONT "\n");
show_opcodes((u8 *)regs->ip, loglvl);
show_opcodes(regs, loglvl);
static void
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment