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

Commit 496a9a5f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Petr Mladek
Browse files

lib/vsprintf: Deduplicate pointer_string() 

There is an exact code at the end of ptr_to_id().
Replace it by calling pointer_string() directly.

This is followup to the commit ad67b74d ("printk: hash addresses
printed with %p").

Cc: Tobin C. Harding <me@tobin.cc>
Link: http://lkml.kernel.org/r/20180216210711.79901-6-andriy.shevchenko@linux.intel.com


To: "Tobin C . Harding" <me@tobin.cc>
To: linux@rasmusvillemoes.dk
To: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
To: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 558594f3

lib/vsprintf.c

+7 −20
Original line number Diff line number Diff line
@@ -1367,13 +1367,6 @@ static noinline_for_stack 
char *restricted_pointer(char *buf, char *end, const void *ptr,

			 struct printf_spec spec)

{

	spec.base = 16;

	spec.flags |= SMALL;

	if (spec.field_width == -1) {

		spec.field_width = 2 * sizeof(ptr);

		spec.flags |= ZEROPAD;

	}



	switch (kptr_restrict) {

	case 0:

		/* Always print %pK values */
@@ -1385,8 +1378,11 @@ char *restricted_pointer(char *buf, char *end, const void *ptr, 
		 * kptr_restrict==1 cannot be used in IRQ context

		 * because its test for CAP_SYSLOG would be meaningless.

		 */

		if (in_irq() || in_serving_softirq() || in_nmi())

		if (in_irq() || in_serving_softirq() || in_nmi()) {

			if (spec.field_width == -1)

				spec.field_width = 2 * sizeof(ptr);

			return string(buf, end, "pK-error", spec);

		}



		/*

		 * Only print the real pointer value if the current
@@ -1411,7 +1407,7 @@ char *restricted_pointer(char *buf, char *end, const void *ptr, 
		break;

	}



	return number(buf, end, (unsigned long)ptr, spec);

	return pointer_string(buf, end, ptr, spec);

}



static noinline_for_stack
@@ -1686,10 +1682,9 @@ early_initcall(initialize_ptr_random); 
static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec)

{

	unsigned long hashval;

	const int default_width = 2 * sizeof(ptr);



	if (unlikely(!have_filled_random_ptr_key)) {

		spec.field_width = default_width;

		spec.field_width = 2 * sizeof(ptr);

		/* string length must be less than default_width */

		return string(buf, end, "(ptrval)", spec);

	}
@@ -1704,15 +1699,7 @@ static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec) 
#else

	hashval = (unsigned long)siphash_1u32((u32)ptr, &ptr_key);

#endif



	spec.flags |= SMALL;

	if (spec.field_width == -1) {

		spec.field_width = default_width;

		spec.flags |= ZEROPAD;

	}

	spec.base = 16;



	return number(buf, end, hashval, spec);

	return pointer_string(buf, end, (const void *)hashval, spec);

}



/*