Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

torvalds · torvalds · commit 13f514bef13c · 2018-02-23T14:57:20.000-08:00
Pull printk fixlet from Petr Mladek:
 "People expect to see the real pointer value for %px.

  Let's substitute '(null)' only for the other %p? format modifiers that
  need to deference the pointer"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  vsprintf: avoid misleading "(null)" for %px
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
@@ -1849,7 +1849,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 {
 	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.

Original file line number	Diff line number	Diff line change
`@@ -1849,7 +1849,7 @@ char pointer(const char fmt, char buf, char end, void *ptr,`
`1849`	`1849`	`{`
`1850`	`1850`	`const int default_width = 2 * sizeof(void *);`
`1851`	`1851`
`1852`		`- if (!ptr && *fmt != 'K') {`
	`1852`	`+ if (!ptr && fmt != 'K' && fmt != 'x') {`
`1853`	`1853`	`/*`
`1854`	`1854`	`* Print (null) with the same width as a pointer so it makes`
`1855`	`1855`	`* tabular output look nice.`