| From: Dave Weinstein <olorin@google.com> |
| Subject: lib: vsprintf: whitelist stack traces |
| |
| Use the %pP functionality to explicitly allow kernel |
| pointers to be logged for stack traces |
| |
| Signed-off-by: Dave Weinstein <olorin@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm64/kernel/traps.c | 4 ++-- |
| include/linux/kallsyms.h | 2 +- |
| kernel/printk/printk.c | 2 +- |
| 3 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/arch/arm64/kernel/traps.c |
| +++ b/arch/arm64/kernel/traps.c |
| @@ -146,7 +146,7 @@ static void dump_backtrace(struct pt_reg |
| unsigned long irq_stack_ptr; |
| int skip; |
| |
| - pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); |
| + pr_debug("%s(regs = %pP tsk = %pP)\n", __func__, regs, tsk); |
| |
| if (!tsk) |
| tsk = current; |
| @@ -252,7 +252,7 @@ static int __die(const char *str, int er |
| |
| print_modules(); |
| __show_regs(regs); |
| - pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n", |
| + pr_emerg("Process %.*s (pid: %d, stack limit = 0x%pP)\n", |
| TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), |
| end_of_stack(tsk)); |
| |
| --- a/include/linux/kallsyms.h |
| +++ b/include/linux/kallsyms.h |
| @@ -122,7 +122,7 @@ static inline void print_symbol(const ch |
| |
| static inline void print_ip_sym(unsigned long ip) |
| { |
| - printk("[<%p>] %pS\n", (void *) ip, (void *) ip); |
| + printk("[<%pP>] %pS\n", (void *) ip, (void *) ip); |
| } |
| |
| #endif /*_LINUX_KALLSYMS_H*/ |
| --- a/kernel/printk/printk.c |
| +++ b/kernel/printk/printk.c |
| @@ -3110,7 +3110,7 @@ void show_regs_print_info(const char *lo |
| { |
| dump_stack_print_info(log_lvl); |
| |
| - printk("%stask: %p task.stack: %p\n", |
| + printk("%stask: %pP task.stack: %pP\n", |
| log_lvl, current, task_stack_page(current)); |
| } |
| |