Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10a7e9d8 authored Dec 19, 2017 by Kees Cook Committed by Linus Torvalds Dec 19, 2017

Do not hash userspace addresses in fault handlers

The hashing of %p was designed to restrict kernel addresses. There is
no reason to hash the userspace values seen during a segfault report,
so switch these to %px. (Some architectures already use %lx.)

Fixes: ad67b74d ("printk: hash addresses printed with %p")
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ace52288

arch/sparc/mm/fault_32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ show_signal_msg(struct pt_regs *regs, int sig, int code,
		if (!printk_ratelimit())
		return;

		printk("%s%s[%d]: segfault at %lx ip %p (rpc %p) sp %p error %x",
		printk("%s%s[%d]: segfault at %lx ip %px (rpc %px) sp %px error %x",
		task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
		tsk->comm, task_pid_nr(tsk), address,
		(void )regs->pc, (void )regs->u_regs[UREG_I7],

arch/sparc/mm/fault_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ show_signal_msg(struct pt_regs *regs, int sig, int code,
		if (!printk_ratelimit())
		return;

		printk("%s%s[%d]: segfault at %lx ip %p (rpc %p) sp %p error %x",
		printk("%s%s[%d]: segfault at %lx ip %px (rpc %px) sp %px error %x",
		task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
		tsk->comm, task_pid_nr(tsk), address,
		(void )regs->tpc, (void )regs->u_regs[UREG_I7],

arch/um/kernel/trap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ static void show_segv_info(struct uml_pt_regs *regs)
		if (!printk_ratelimit())
		return;

		printk("%s%s[%d]: segfault at %lx ip %p sp %p error %x",
		printk("%s%s[%d]: segfault at %lx ip %px sp %px error %x",
		task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
		tsk->comm, task_pid_nr(tsk), FAULT_ADDRESS(*fi),
		(void )UPT_IP(regs), (void )UPT_SP(regs),

arch/x86/mm/fault.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -860,7 +860,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,
		if (!printk_ratelimit())
		return;

		printk("%s%s[%d]: segfault at %lx ip %p sp %p error %lx",
		printk("%s%s[%d]: segfault at %lx ip %px sp %px error %lx",
		task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
		tsk->comm, task_pid_nr(tsk), address,
		(void )regs->ip, (void )regs->sp, error_code);