Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aefbab3e authored by Kees Cook's avatar Kees Cook Committed by Alistair Strachan
Browse files

UPSTREAM: 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: default avatarKees Cook <keescook@chromium.org>
(cherry picked from commit 4f5e838605c264fcf16c3ff9495bd83da99acc6a)
Signed-off-by: default avatarSandeep Patil <sspatil@android.com>

Bug: 78533979
Test: Build and boot cuttlefish
Change-Id: I6818c6a678844f174f4ac7ca08b945ec7ce229d5
parent 47e67b43

mm/usercopy.c

+4 −5
Original line number Diff line number Diff line
@@ -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);