summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2019-04-17 14:53:49 +0300
committerPetr Mladek <pmladek@suse.com>2019-04-26 17:21:03 +0300
commit635720ac75a51092b456bed517ff170047883252 (patch)
tree9f458a2c4488835f3935301a87d976c04d4f2532
parent3e5903eb9cff707301712498aed9e34b3e2ee883 (diff)
downloadlinux-635720ac75a51092b456bed517ff170047883252.tar.xz
vsprintf: Avoid confusion between invalid address and value
We are able to detect invalid values handled by %p[iI] printk specifier. The current error message is "invalid address". It might cause confusion against "(efault)" reported by the generic valid_pointer_address() check. Let's unify the style and use the more appropriate error code description "(einval)". Link: http://lkml.kernel.org/r/20190417115350.20479-10-pmladek@suse.com To: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: "Tobin C . Harding" <me@tobin.cc> Cc: Joe Perches <joe@perches.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> Cc: linux-kernel@vger.kernel.org Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Petr Mladek <pmladek@suse.com>
-rw-r--r--Documentation/core-api/printk-formats.rst1
-rw-r--r--lib/vsprintf.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
index b2cac8d76b66..75d2bbe9813f 100644
--- a/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@ -64,6 +64,7 @@ might be printed instead of the unreachable information::
(null) data on plain NULL address
(efault) data on invalid address
+ (einval) invalid data on a valid address
Plain Pointers
--------------
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b989f1e8f35b..4e5666035b74 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1511,7 +1511,7 @@ char *ip_addr_string(char *buf, char *end, const void *ptr,
case AF_INET6:
return ip6_addr_string_sa(buf, end, &sa->v6, spec, fmt);
default:
- return string_nocheck(buf, end, "(invalid address)", spec);
+ return string_nocheck(buf, end, "(einval)", spec);
}}
}