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

Commit 26297607 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

vsprintf: neaten %pK kptr_restrict, save a bit of code space 



If kptr restrictions are on, just set the passed pointer to NULL.

$ size lib/vsprintf.o.*
   text	   data	    bss	    dec	    hex	filename
   8247	      4	      2	   8253	   203d	lib/vsprintf.o.new
   8282	      4	      2	   8288	   2060	lib/vsprintf.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Dan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3bb598fb

lib/vsprintf.c

+5 −9
Original line number Diff line number Diff line
@@ -1047,16 +1047,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, 
			if (spec.field_width == -1)

				spec.field_width = 2 * sizeof(void *);

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

		} else if ((kptr_restrict == 0) ||

		}

		if (!((kptr_restrict == 0) ||

		      (kptr_restrict == 1 &&

			  has_capability_noaudit(current, CAP_SYSLOG)))

		       has_capability_noaudit(current, CAP_SYSLOG))))

			ptr = NULL;

		break;



		if (spec.field_width == -1) {

			spec.field_width = 2 * sizeof(void *);

			spec.flags |= ZEROPAD;

		}

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

	}

	spec.flags |= SMALL;

	if (spec.field_width == -1) {