vsprintf: don't use 'restricted_pointer()' when not restricting

ef0010a3 · Linus Torvalds <[email protected]> · 2017-11-29 11:28:09 -08:00

Instead, just fall back on the new '%p' behavior which hashes the
pointer.

Otherwise, '%pK' - that was intended to mark a pointer as restricted -
just ends up leaking pointers that a normal '%p' wouldn't leak.  Which
just make the whole thing pointless.

I suspect we should actually get rid of '%pK' entirely, and make it just
work as '%p' regardless, but this is the minimal obvious fix.  People
who actually use 'kptr_restrict' should weigh in on which behavior they
want.

Cc: Tobin Harding <[email protected]>
Cc: Kees Cook <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: ef0010a30935de4e0211cbc7bdffc30446cdee9b
Parents: 668533dc

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
lib/vsprintf.c	modified	+2	−0	View file

lib/vsprintf.c

View file

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d960aea..01c3957 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1931,6 +1931,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 			return buf;
 		}
 	case 'K':
+		if (!kptr_restrict)
+			break;
 		return restricted_pointer(buf, end, ptr, spec);
 	case 'N':
 		return netdev_bits(buf, end, ptr, fmt);