summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-08 16:34:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 16:23:03 +0900
commit45ec16908e84e00d847e9063231fb3a75e6366bc (patch)
treeb113d04dc7c7bcc53a36cfafeb978ef6035dfd3a
parent8449d21fb49e9824e2736c5febd6b5d287cd2ba1 (diff)
downloadlinux-3.10-45ec16908e84e00d847e9063231fb3a75e6366bc.tar.gz
linux-3.10-45ec16908e84e00d847e9063231fb3a75e6366bc.tar.bz2
linux-3.10-45ec16908e84e00d847e9063231fb3a75e6366bc.zip
mm: use %pK for /proc/vmallocinfo
In the paranoid case of sysctl kernel.kptr_restrict=2, mask the kernel virtual addresses in /proc/vmallocinfo too. Signed-off-by: Kees Cook <keescook@chromium.org> Reported-by: Brad Spengler <spender@grsecurity.net> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/vmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 8de704679bf..78e08300db2 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2571,7 +2571,7 @@ static int s_show(struct seq_file *m, void *p)
{
struct vm_struct *v = p;
- seq_printf(m, "0x%p-0x%p %7ld",
+ seq_printf(m, "0x%pK-0x%pK %7ld",
v->addr, v->addr + v->size, v->size);
if (v->caller)