usercopy: Remove pointer from overflow report

Using %p was already mostly useless in the usercopy overflow reports,
so this removes it entirely to avoid confusion now that %p-hashing
is enabled.

Fixes: ad67b74d2469d9b8 ("printk: hash addresses printed with %p")
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/mm/usercopy.c b/mm/usercopy.c
index a9852b24715d25598a7603560ffc042ca0153a2b..5df1e68d45857c322d49dae511f69f8f6e337c40 100644 (file)
--- a/mm/usercopy.c
+++ b/mm/usercopy.c
@@ -58,12 +58,11 @@ static noinline int check_stack_object(const void *obj, unsigned long len)
        return GOOD_STACK;
 }
 
-static void report_usercopy(const void *ptr, unsigned long len,
-                           bool to_user, const char *type)
+static void report_usercopy(unsigned long len, bool to_user, const char *type)
 {
-       pr_emerg("kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
+       pr_emerg("kernel memory %s attempt detected %s '%s' (%lu bytes)\n",
                to_user ? "exposure" : "overwrite",
-               to_user ? "from" : "to", ptr, type ? : "unknown", len);
+               to_user ? "from" : "to", type ? : "unknown", len);
        /*
         * For greater effect, it would be nice to do do_group_exit(),
         * but BUG() actually hooks all the lock-breaking and per-arch
@@ -261,6 +260,6 @@ void __check_object_size(const void *ptr, unsigned long n, bool to_user)
                return;
 
 report:
-       report_usercopy(ptr, n, to_user, err);
+       report_usercopy(n, to_user, err);
 }
 EXPORT_SYMBOL(__check_object_size);