1 files changed, 84 insertions, 0 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a013bbc2371..0fbd0121d91 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -170,6 +170,8 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
                 return -EINVAL;
 
         val = simple_strtoul(cp, &tail, base);
+        if (tail == cp)
+                return -EINVAL;
         if ((*tail == '\0') ||
                 ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
                 *res = val;
@@ -241,6 +243,8 @@ int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res)
                 return -EINVAL;
 
         val = simple_strtoull(cp, &tail, base);
+        if (tail == cp)
+                return -EINVAL;
         if ((*tail == '\0') ||
                 ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
                 *res = val;
@@ -581,6 +585,62 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
         return string(buf, end, sym, field_width, precision, flags);
 }
 
+static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width,
+                                int precision, int flags)
+{
+        char mac_addr[6 * 3]; /* (6 * 2 hex digits), 5 colons and trailing zero */
+        char *p = mac_addr;
+        int i;
+
+        for (i = 0; i < 6; i++) {
+                p = pack_hex_byte(p, addr[i]);
+                if (!(flags & SPECIAL) && i != 5)
+                        *p++ = ':';
+        }
+        *p = '\0';
+
+        return string(buf, end, mac_addr, field_width, precision, flags & ~SPECIAL);
+}
+
+static char *ip6_addr_string(char *buf, char *end, u8 *addr, int field_width,
+                         int precision, int flags)
+{
+        char ip6_addr[8 * 5]; /* (8 * 4 hex digits), 7 colons and trailing zero */
+        char *p = ip6_addr;
+        int i;
+
+        for (i = 0; i < 8; i++) {
+                p = pack_hex_byte(p, addr[2 * i]);
+                p = pack_hex_byte(p, addr[2 * i + 1]);
+                if (!(flags & SPECIAL) && i != 7)
+                        *p++ = ':';
+        }
+        *p = '\0';
+
+        return string(buf, end, ip6_addr, field_width, precision, flags & ~SPECIAL);
+}
+
+static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
+                         int precision, int flags)
+{
+        char ip4_addr[4 * 4]; /* (4 * 3 decimal digits), 3 dots and trailing zero */
+        char temp[3];   /* hold each IP quad in reverse order */
+        char *p = ip4_addr;
+        int i, digits;
+
+        for (i = 0; i < 4; i++) {
+                digits = put_dec_trunc(temp, addr[i]) - temp;
+                /* reverse the digits in the quad */
+                while (digits--)
+                        *p++ = temp[digits];
+                if (i != 3)
+                        *p++ = '.';
+        }
+        *p = '\0';
+
+        return string(buf, end, ip4_addr, field_width, precision, flags & ~SPECIAL);
+}
+
 /*
  * Show a '%p' thing.  A kernel extension is that the '%p' is followed
  * by an extra set of alphanumeric characters that are extended format
@@ -592,6 +652,12 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
  * - 'S' For symbolic direct pointers
  * - 'R' For a struct resource pointer, it prints the range of
  *       addresses (not the name nor the flags)
+ * - 'M' For a 6-byte MAC address, it prints the address in the
+ *       usual colon-separated hex notation
+ * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way (dot-separated
+ *       decimal for v4 and colon separated network-order 16 bit hex for v6)
+ * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is
+ *       currently the same
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -599,6 +665,9 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
  */
 static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field_width, int precision, int flags)
 {
+        if (!ptr)
+                return string(buf, end, "(null)", field_width, precision, flags);
+
         switch (*fmt) {
         case 'F':
                 ptr = dereference_function_descriptor(ptr);
@@ -607,6 +676,21 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
                 return symbol_string(buf, end, ptr, field_width, precision, flags);
         case 'R':
                 return resource_string(buf, end, ptr, field_width, precision, flags);
+        case 'm':
+                flags |= SPECIAL;
+                /* Fallthrough */
+        case 'M':
+                return mac_address_string(buf, end, ptr, field_width, precision, flags);
+        case 'i':
+                flags |= SPECIAL;
+                /* Fallthrough */
+        case 'I':
+                if (fmt[1] == '6')
+                        return ip6_addr_string(buf, end, ptr, field_width, precision, flags);
+                if (fmt[1] == '4')
+                        return ip4_addr_string(buf, end, ptr, field_width, precision, flags);
+                flags &= ~SPECIAL;
+                break;
         }
         flags |= SMALL;
         if (field_width == -1) {