1 files changed, 4 insertions, 2 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 1d659d7bb0f8..4365df31a1d5 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -666,6 +666,8 @@ char *ip6_compressed_string(char *p, const char *addr)
                         colonpos = i;
                 }
         }
+        if (longest == 1)               /* don't compress a single 0 */
+                colonpos = -1;
 
         /* emit address */
         for (i = 0; i < range; i++) {
@@ -826,7 +828,7 @@ int kptr_restrict __read_mostly;
  *       IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
  * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order
  * - 'I6c' for IPv6 addresses printed as specified by
- *       http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
+ *       http://tools.ietf.org/html/rfc5952
  * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
  *       "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
  *       Options for %pU are:
@@ -898,7 +900,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
         case 'U':
                 return uuid_string(buf, end, ptr, spec, fmt);
         case 'V':
-                return buf + vsnprintf(buf, end - buf,
+                return buf + vsnprintf(buf, end > buf ? end - buf : 0,
                                        ((struct va_format *)ptr)->fmt,
                                        *(((struct va_format *)ptr)->va));
         case 'K':