4.15-stable review patch.  If anyone has any objections, please let me know.


From: Adam Borowski <kilob...@angband.pl>

commit 3a129cc2151425e5aeb69aeb25fbc994ec738137 upstream.

Like %pK already does, print "00000000" instead.

This confused people -- the convention is that "(null)" means you tried to
dereference a null pointer as opposed to printing the address.

Link: http://lkml.kernel.org/r/20180204174521.21383-1-kilob...@angband.pl
To: Sergey Senozhatsky <sergey.senozhat...@gmail.com>
To: Steven Rostedt <rost...@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Joe Perches <j...@perches.com>
Cc: Kees Cook <keesc...@chromium.org>
Cc: "Roberts, William C" <william.c.robe...@intel.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: David Laight <david.lai...@aculab.com>
Cc: Randy Dunlap <rdun...@infradead.org>
Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
Signed-off-by: Adam Borowski <kilob...@angband.pl>
Signed-off-by: Petr Mladek <pmla...@suse.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

 lib/vsprintf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1849,7 +1849,7 @@ char *pointer(const char *fmt, char *buf
        const int default_width = 2 * sizeof(void *);
-       if (!ptr && *fmt != 'K') {
+       if (!ptr && *fmt != 'K' && *fmt != 'x') {
                 * Print (null) with the same width as a pointer so it makes
                 * tabular output look nice.

Reply via email to