vsprintf: Factor out %p[iI] handler as ip_addr_string()

Move the non-trivial code from the long pointer() function. We are going
to improve error handling that will make it even more complicated.

This patch does not change the existing behavior.

Link: http://lkml.kernel.org/r/20190417115350.20479-5-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>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c9c9a117987071a2d15022e066b9bb68c3849f37..8ca29bc0d7865a700ea3e8dc07e7a7510572fc1e 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1431,6 +1431,35 @@ char *ip4_addr_string_sa(char *buf, char *end, const struct sockaddr_in *sa,
        return string_nocheck(buf, end, ip4_addr, spec);
 }
 
+static noinline_for_stack
+char *ip_addr_string(char *buf, char *end, const void *ptr,
+                    struct printf_spec spec, const char *fmt)
+{
+       switch (fmt[1]) {
+       case '6':
+               return ip6_addr_string(buf, end, ptr, spec, fmt);
+       case '4':
+               return ip4_addr_string(buf, end, ptr, spec, fmt);
+       case 'S': {
+               const union {
+                       struct sockaddr         raw;
+                       struct sockaddr_in      v4;
+                       struct sockaddr_in6     v6;
+               } *sa = ptr;
+
+               switch (sa->raw.sa_family) {
+               case AF_INET:
+                       return ip4_addr_string_sa(buf, end, &sa->v4, spec, fmt);
+               case AF_INET6:
+                       return ip6_addr_string_sa(buf, end, &sa->v6, spec, fmt);
+               default:
+                       return string_nocheck(buf, end, "(invalid address)", spec);
+               }}
+       }
+
+       return ptr_to_id(buf, end, ptr, spec);
+}
+
 static noinline_for_stack
 char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
                     const char *fmt)
@@ -2011,28 +2040,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                                         * 4:   001.002.003.004
                                         * 6:   000102...0f
                                         */
-               switch (fmt[1]) {
-               case '6':
-                       return ip6_addr_string(buf, end, ptr, spec, fmt);
-               case '4':
-                       return ip4_addr_string(buf, end, ptr, spec, fmt);
-               case 'S': {
-                       const union {
-                               struct sockaddr         raw;
-                               struct sockaddr_in      v4;
-                               struct sockaddr_in6     v6;
-                       } *sa = ptr;
-
-                       switch (sa->raw.sa_family) {
-                       case AF_INET:
-                               return ip4_addr_string_sa(buf, end, &sa->v4, spec, fmt);
-                       case AF_INET6:
-                               return ip6_addr_string_sa(buf, end, &sa->v6, spec, fmt);
-                       default:
-                               return string_nocheck(buf, end, "(invalid address)", spec);
-                       }}
-               }
-               break;
+               return ip_addr_string(buf, end, ptr, spec, fmt);
        case 'E':
                return escaped_string(buf, end, ptr, spec, fmt);
        case 'U':