x86/dumpstack: Dump user space code correctly again
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]/
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 56 lines · Thomas Gleixner
Subject: x86/dumpstack: Dump user space code correctly again
From: Thomas Gleixner <[email protected]>
Date: Wed, 22 Jul 2020 10:39:54 +0200H.J. reported that post 5.7 a segfault of a user space task does not longer dump the Code bytes when
/proc/sys/debug/exception-traceis enabled. It prints 'Code: Bad RIP value.' instead.This was broken by a recent change which made
probe_kernel_read()reject non-kernel addresses.Update
show_opcodes()so it retrieves user space opcodes viacopy_from_user_nmi().Fixes 98a23609b103 ("maccess: always use strict semantics for probe_kernel_read")Reported-by H.J. Lu <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>--- arch/x86/kernel/dumpstack.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)arch/x86/kernel/dumpstack.c +16
-5@@ -71,6 +71,22 @@ static void printk_stack_address(unsigneprintk ("%s %s%pB\n" , log_lvl, reliable ?"" :"? " , (void *)address); } +static int copy_code (struct pt_regs *regs,u8 *buf,unsigned long src, +unsigned int nbytes) +{ +if (!user_mode (regs)) +return copy_from_kernel_nofault (buf, (u8 *)src, nbytes); + +/* +* Make sure userspace isn't trying to trick us into dumping kernel +* memory by pointing the userspace instruction pointer at it. +*/ +if (__chk_range_not_ok (src, nbytes,TASK_SIZE_MAX )) +return -EINVAL ; + +return copy_from_user_nmi (buf, (void __user *)src, nbytes); +} +/* * There are a couple of reasons for the 2/3rd prologue, courtesy of Linus: * @@ -97,17 +113,8 @@ void show_opcodes(struct pt_regs *regs,#define OPCODE_BUFSIZE (PROLOGUE_SIZE + 1 + EPILOGUE_SIZE)u8 opcodes[OPCODE_BUFSIZE ];unsigned long prologue = regs->ip -PROLOGUE_SIZE ; -bool bad_ip; - -/* -* Make sure userspace isn't trying to trick us into dumping kernel -* memory by pointing the userspace instruction pointer at it.
arch/x86/kernel/dumpstack.c void show_opcodes(struct pt_regs *regs, · line 120
Quoted 10 lines
arch/x86/kernel/dumpstack.c +1
-5-*/ - bad_ip =user_mode (regs) && -__chk_range_not_ok (prologue,OPCODE_BUFSIZE ,TASK_SIZE_MAX ); -if (bad_ip ||copy_from_kernel_nofault (opcodes, (u8 *)prologue, -OPCODE_BUFSIZE )) { +if (copy_code (regs, opcodes, prologue,sizeof (opcodes))) {printk ("%sCode: Bad RIP value.\n" , loglvl); }else { printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %"
Add a kerel self test?
Signature · 1 line
H.J.
Quoted 7 lines · H.J. Lu
Quoted 4 lines · Thomas Gleixner
+ if (copy_code(regs, opcodes, prologue, sizeof(opcodes))) { printk("%sCode: Bad RIP value.\n", loglvl); } else { printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %"Add a kerel self test?
Care to whip one up?
Quoted 12 lines · Thomas Gleixner
Quoted 7 lines · H.J. Lu
Quoted 4 lines · Thomas Gleixner
+ if (copy_code(regs, opcodes, prologue, sizeof(opcodes))) { printk("%sCode: Bad RIP value.\n", loglvl); } else { printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %"Add a kerel self test?
Care to whip one up?
Can we count "dmesg" to always dump opcode?
Signature · 1 line
H.J.
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d181d2da0141371bbc360eaea78719203e165e1c Gitweb: https://git.kernel.org/tip/d181d2da0141371bbc360eaea78719203e165e1c Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 22 Jul 2020 10:39:54 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 22 Jul 2020 23:47:48 +02:00
x86/dumpstack: Dump user space code correctly again
H.J. reported that post 5.7 a segfault of a user space task does not longer dump the Code bytes when /proc/sys/debug/exception-trace is enabled. It prints 'Code: Bad RIP value.' instead.
This was broken by a recent change which made probe_kernel_read() reject non-kernel addresses.
Update show_opcodes() so it retrieves user space opcodes via copy_from_user_nmi().
--- arch/x86/kernel/dumpstack.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
arch/x86/kernel/dumpstack.c +17 -10
@@ -71,6 +71,22 @@ static void printk_stack_address(unsigned long address, int reliable,printk ("%s %s%pB\n" , log_lvl, reliable ?"" :"? " , (void *)address); } +static int copy_code (struct pt_regs *regs,u8 *buf,unsigned long src, +unsigned int nbytes) +{ +if (!user_mode (regs)) +return copy_from_kernel_nofault (buf, (u8 *)src, nbytes); + +/* +* Make sure userspace isn't trying to trick us into dumping kernel +* memory by pointing the userspace instruction pointer at it. +*/ +if (__chk_range_not_ok (src, nbytes,TASK_SIZE_MAX )) +return -EINVAL ; + +return copy_from_user_nmi (buf, (void __user *)src, nbytes); +} +/* * There are a couple of reasons for the 2/3rd prologue, courtesy of Linus: *
@@ -97,17 +113,8 @@ void show_opcodes(struct pt_regs *regs, const char *loglvl)#define OPCODE_BUFSIZE (PROLOGUE_SIZE + 1 + EPILOGUE_SIZE)u8 opcodes[OPCODE_BUFSIZE ];unsigned long prologue = regs->ip -PROLOGUE_SIZE ; -bool bad_ip; - -/* -* 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 (prologue,OPCODE_BUFSIZE ,TASK_SIZE_MAX ); -if (bad_ip ||copy_from_kernel_nofault (opcodes, (u8 *)prologue, -OPCODE_BUFSIZE )) { +if (copy_code (regs, opcodes, prologue,sizeof (opcodes))) {printk ("%sCode: Bad RIP value.\n" , loglvl); }else { printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %"
Christoph Hellwig
Reviewed-byQuoted 11 lines · Thomas Gleixner
Subject: x86/dumpstack: Dump user space code correctly again
From: Thomas Gleixner <[email protected]>
Date: Wed, 22 Jul 2020 10:39:54 +0200H.J. reported that post 5.7 a segfault of a user space task does not longer dump the Code bytes when
/proc/sys/debug/exception-traceis enabled. It prints 'Code: Bad RIP value.' instead.This was broken by a recent change which made
probe_kernel_read()reject non-kernel addresses.
Quoted 6 lines
Update
show_opcodes()so it retrieves user space opcodes viacopy_from_user_nmi().Fixes 98a23609b103 ("maccess: always use strict semantics for probe_kernel_read")Reported-by H.J. Lu <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>
Looks good, and also cleans up the code nicely:
But one question below:
Review
Quoted 8 lines
(quoted diff) +8
-0+ /* + * Make sure userspace isn't trying to trick us into dumping kernel + * memory by pointing the userspace instruction pointer at it. + */ + if (__chk_range_not_ok(src, nbytes, TASK_SIZE_MAX)) + return -EINVAL; + + return copy_from_user_nmi(buf, (void __user *)src, nbytes);
copy_from_user_nmi already contains a:
if (__range_not_ok(from, n, TASK_SIZE)) return n;
what is the reason it checks for TASK_SIZE vs TASK_SIZE_MAX, and why do we need both checks?
Quoted 12 lines · Christoph Hellwig
Review
Quoted 8 lines · Thomas Gleixner
(quoted diff) +8
-0+ /* + * Make sure userspace isn't trying to trick us into dumping kernel + * memory by pointing the userspace instruction pointer at it. + */ + if (__chk_range_not_ok(src, nbytes, TASK_SIZE_MAX)) + return -EINVAL; + + return copy_from_user_nmi(buf, (void __user *)src, nbytes);
copy_from_user_nmialready contains a:
Quoted 5 lines
if (__range_not_ok(from, n, TASK_SIZE)) return n;what is the reason it checks for
TASK_SIZEvsTASK_SIZE_MAX, and why do we need both checks?
TBH, I just kept it because being lazy. But you are right, the check is redundant and TASK_SIZE_MAX is inaccurate as it does not take compat tasks into account. I'll rip that out.
Thanks,
tglx