2011-02-12 03:21:54

by Kees Cook

Subject: [PATCH] hide kernel addresses via %pK in /proc/timer_list

In the continuing effort to avoid kernel addresses leaking to unprivileged
users, this patch switches to %pK for /proc/timer_list reporting.

Signed-off-by: Kees Cook <[email protected]>
---
Please ignore Message-ID: <[email protected]> which broke
the headers. I hate my MUA.

kernel/time/timer_list.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 32a19f9..3258455 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -41,7 +41,7 @@ static void print_name_offset(struct seq_file *m, void *sym)
char symname[KSYM_NAME_LEN];

if (lookup_symbol_name((unsigned long)sym, symname) < 0)
- SEQ_printf(m, "<%p>", sym);
+ SEQ_printf(m, "<%pK>", sym);
else
SEQ_printf(m, "%s", symname);
}
@@ -112,7 +112,7 @@ next_one:
static void
print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
{
- SEQ_printf(m, " .base: %p\n", base);
+ SEQ_printf(m, " .base: %pK\n", base);
SEQ_printf(m, " .index: %d\n",
base->index);
SEQ_printf(m, " .resolution: %Lu nsecs\n",
--
1.7.2.3

--
Kees Cook
Ubuntu Security Team

2011-02-13 01:34:39

by Kees Cook

Subject: [tip:timers/urgent] timer debug: Hide kernel addresses via %pK in /proc/timer_list

Commit-ID: f590308536db432e4747f562b29e5858123938e9
Gitweb: http://git.kernel.org/tip/f590308536db432e4747f562b29e5858123938e9
Author: Kees Cook <[email protected]>
AuthorDate: Fri, 11 Feb 2011 19:21:25 -0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Sat, 12 Feb 2011 14:11:56 +0100

timer debug: Hide kernel addresses via %pK in /proc/timer_list

In the continuing effort to avoid kernel addresses leaking to
unprivileged users, this patch switches to %pK for
/proc/timer_list reporting.

Signed-off-by: Kees Cook <[email protected]>
Cc: John Stultz <[email protected]>
Cc: Dan Rosenberg <[email protected]>
Cc: Eugene Teo <[email protected]>
Cc: Linus Torvalds <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/time/timer_list.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 32a19f9..3258455 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -41,7 +41,7 @@ static void print_name_offset(struct seq_file *m, void *sym)
char symname[KSYM_NAME_LEN];

if (lookup_symbol_name((unsigned long)sym, symname) < 0)
- SEQ_printf(m, "<%p>", sym);
+ SEQ_printf(m, "<%pK>", sym);
else
SEQ_printf(m, "%s", symname);
}
@@ -112,7 +112,7 @@ next_one:
static void
print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
{
- SEQ_printf(m, " .base: %p\n", base);
+ SEQ_printf(m, " .base: %pK\n", base);
SEQ_printf(m, " .index: %d\n",
base->index);
SEQ_printf(m, " .resolution: %Lu nsecs\n",