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

Commit 47e67b43 authored Dec 19, 2017 by Kees Cook Committed by Alistair Strachan Mar 28, 2019

UPSTREAM: 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: ad67b74d2469d9b8 ("printk: hash addresses printed with %p")
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 10a7e9d849150a2879efc0b04d8a51068c9dd0c5)
Signed-off-by: Sandeep Patil <sspatil@android.com>

Bug: 78533979
Test: Build and boot cuttlefish
Change-Id: Ibd04bf839ec7c86884ad2366324bf9cd69d05f34

parent 9916e598

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);