raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Revert "proc/wchan: use printk format instead of lookup_symbol_name()"

Browse Source 
commit 54354c6a9f upstream.

This reverts commit 152c432b12.

When a kernel address couldn't be symbolized for /proc/$pid/wchan, it
would leak the raw value, a potential information exposure. This is a
regression compared to the safer pre-v5.12 behavior.

Reported-by: kernel test robot <oliver.sang@intel.com>
Reported-by: Vito Caputo <vcaputo@pengaru.com>
Reported-by: Jann Horn <jannh@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20211008111626.090829198@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook
2021-09-29 15:02:13 -07:00
committed by Greg Kroah-Hartman
parent 2e93afda05
commit ec7c20d417
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/proc/base.c
View File

@@ -67,6 +67,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/kallsyms.h>
#include <linux/stacktrace.h> #include <linux/stacktrace.h>
#include <linux/resource.h> #include <linux/resource.h>
#include <linux/module.h> #include <linux/module.h>
@@ -386,17 +387,19 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task) struct pid *pid, struct task_struct *task)
{ {
unsigned long wchan; unsigned long wchan;
char symname[KSYM_NAME_LEN];
if (!ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS))
goto print0;
if (ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS))
wchan = get_wchan(task); wchan = get_wchan(task);
else if (wchan && !lookup_symbol_name(wchan, symname)) {
wchan = 0; seq_puts(m, symname);
return 0;
}
if (wchan) print0:
seq_printf(m, "%ps", (void *) wchan);
else
seq_putc(m, '0'); seq_putc(m, '0');
return 0; return 0;
} }
#endif /* CONFIG_KALLSYMS */ #endif /* CONFIG_KALLSYMS */