1 files changed, 18 insertions, 40 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 185b6d300ebc..0648291cdafe 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -364,7 +364,6 @@ enum format_type {
         FORMAT_TYPE_SHORT,
         FORMAT_TYPE_UINT,
         FORMAT_TYPE_INT,
-        FORMAT_TYPE_NRCHARS,
         FORMAT_TYPE_SIZE_T,
         FORMAT_TYPE_PTRDIFF
 };
@@ -719,10 +718,15 @@ char *resource_string(char *buf, char *end, struct resource *res,
                 specp = &mem_spec;
                 decode = 0;
         }
-        p = number(p, pend, res->start, *specp);
-        if (res->start != res->end) {
-                *p++ = '-';
-                p = number(p, pend, res->end, *specp);
+        if (decode && res->flags & IORESOURCE_UNSET) {
+                p = string(p, pend, "size ", str_spec);
+                p = number(p, pend, resource_size(res), *specp);
+        } else {
+                p = number(p, pend, res->start, *specp);
+                if (res->start != res->end) {
+                        *p++ = '-';
+                        p = number(p, pend, res->end, *specp);
+                }
         }
         if (decode) {
                 if (res->flags & IORESOURCE_MEM_64)
@@ -1533,10 +1537,6 @@ qualifier:
                 return fmt - start;
                 /* skip alnum */
 
-        case 'n':
-                spec->type = FORMAT_TYPE_NRCHARS;
-                return ++fmt - start;
-
         case '%':
                 spec->type = FORMAT_TYPE_PERCENT_CHAR;
                 return ++fmt - start;
@@ -1559,6 +1559,15 @@ qualifier:
         case 'u':
                 break;
 
+        case 'n':
+                /*
+                 * Since %n poses a greater security risk than utility, treat
+                 * it as an invalid format specifier. Warn about its use so
+                 * that new instances don't get added.
+                 */
+                WARN_ONCE(1, "Please remove ignored %%n in '%s'\n", fmt);
+                /* Fall-through */
+
         default:
                 spec->type = FORMAT_TYPE_INVALID;
                 return fmt - start;
@@ -1732,20 +1741,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                         ++str;
                         break;
 
-                case FORMAT_TYPE_NRCHARS: {
-                        /*
-                         * Since %n poses a greater security risk than
-                         * utility, ignore %n and skip its argument.
-                         */
-                        void *skip_arg;
-
-                        WARN_ONCE(1, "Please remove ignored %%n in '%s'\n",
-                                        old_fmt);
-
-                        skip_arg = va_arg(args, void *);
-                        break;
-                }
-
                 default:
                         switch (spec.type) {
                         case FORMAT_TYPE_LONG_LONG:
@@ -2020,19 +2015,6 @@ do {									\
                                 fmt++;
                         break;
 
-                case FORMAT_TYPE_NRCHARS: {
-                        /* skip %n 's argument */
-                        u8 qualifier = spec.qualifier;
-                        void *skip_arg;
-                        if (qualifier == 'l')
-                                skip_arg = va_arg(args, long *);
-                        else if (_tolower(qualifier) == 'z')
-                                skip_arg = va_arg(args, size_t *);
-                        else
-                                skip_arg = va_arg(args, int *);
-                        break;
-                }
-
                 default:
                         switch (spec.type) {
 
@@ -2191,10 +2173,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                         ++str;
                         break;
 
-                case FORMAT_TYPE_NRCHARS:
-                        /* skip */
-                        break;
-
                 default: {
                         unsigned long long num;