5 files changed, 181 insertions, 179 deletions

diff --git a/lib/lru_cache.c b/lib/lru_cache.c
index 852c81e3ba9a..028f5d996eef 100644
--- a/lib/lru_cache.c
+++ b/lib/lru_cache.c
@@ -247,10 +247,11 @@ size_t lc_seq_printf_stats(struct seq_file *seq, struct lru_cache *lc)
          * progress) and "changed", when this in fact lead to an successful
          * update of the cache.
          */
-        return seq_printf(seq, "\t%s: used:%u/%u "
-                "hits:%lu misses:%lu starving:%lu locked:%lu changed:%lu\n",
-                lc->name, lc->used, lc->nr_elements,
-                lc->hits, lc->misses, lc->starving, lc->locked, lc->changed);
+        seq_printf(seq, "\t%s: used:%u/%u hits:%lu misses:%lu starving:%lu locked:%lu changed:%lu\n",
+                   lc->name, lc->used, lc->nr_elements,
+                   lc->hits, lc->misses, lc->starving, lc->locked, lc->changed);
+
+        return 0;
 }
 
 static struct hlist_head *lc_hash_slot(struct lru_cache *lc, unsigned int enr)
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 8f8c4417f228..1826c7407258 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -239,29 +239,21 @@ int string_unescape(char *src, char *dst, size_t size, unsigned int flags)
 }
 EXPORT_SYMBOL(string_unescape);
 
-static int escape_passthrough(unsigned char c, char **dst, size_t *osz)
+static bool escape_passthrough(unsigned char c, char **dst, char *end)
 {
         char *out = *dst;
 
-        if (*osz < 1)
-                return -ENOMEM;
-
-        *out++ = c;
-
-        *dst = out;
-        *osz -= 1;
-
-        return 1;
+        if (out < end)
+                *out = c;
+        *dst = out + 1;
+        return true;
 }
 
-static int escape_space(unsigned char c, char **dst, size_t *osz)
+static bool escape_space(unsigned char c, char **dst, char *end)
 {
         char *out = *dst;
         unsigned char to;
 
-        if (*osz < 2)
-                return -ENOMEM;
-
         switch (c) {
         case '\n':
                 to = 'n';
@@ -279,26 +271,25 @@ static int escape_space(unsigned char c, char **dst, size_t *osz)
                 to = 'f';
                 break;
         default:
-                return 0;
+                return false;
         }
 
-        *out++ = '\\';
-        *out++ = to;
+        if (out < end)
+                *out = '\\';
+        ++out;
+        if (out < end)
+                *out = to;
+        ++out;
 
         *dst = out;
-        *osz -= 2;
-
-        return 1;
+        return true;
 }
 
-static int escape_special(unsigned char c, char **dst, size_t *osz)
+static bool escape_special(unsigned char c, char **dst, char *end)
 {
         char *out = *dst;
         unsigned char to;
 
-        if (*osz < 2)
-                return -ENOMEM;
-
         switch (c) {
         case '\\':
                 to = '\\';
@@ -310,71 +301,78 @@ static int escape_special(unsigned char c, char **dst, size_t *osz)
                 to = 'e';
                 break;
         default:
-                return 0;
+                return false;
         }
 
-        *out++ = '\\';
-        *out++ = to;
+        if (out < end)
+                *out = '\\';
+        ++out;
+        if (out < end)
+                *out = to;
+        ++out;
 
         *dst = out;
-        *osz -= 2;
-
-        return 1;
+        return true;
 }
 
-static int escape_null(unsigned char c, char **dst, size_t *osz)
+static bool escape_null(unsigned char c, char **dst, char *end)
 {
         char *out = *dst;
 
-        if (*osz < 2)
-                return -ENOMEM;
-
         if (c)
-                return 0;
+                return false;
 
-        *out++ = '\\';
-        *out++ = '0';
+        if (out < end)
+                *out = '\\';
+        ++out;
+        if (out < end)
+                *out = '0';
+        ++out;
 
         *dst = out;
-        *osz -= 2;
-
-        return 1;
+        return true;
 }
 
-static int escape_octal(unsigned char c, char **dst, size_t *osz)
+static bool escape_octal(unsigned char c, char **dst, char *end)
 {
         char *out = *dst;
 
-        if (*osz < 4)
-                return -ENOMEM;
-
-        *out++ = '\\';
-        *out++ = ((c >> 6) & 0x07) + '0';
-        *out++ = ((c >> 3) & 0x07) + '0';
-        *out++ = ((c >> 0) & 0x07) + '0';
+        if (out < end)
+                *out = '\\';
+        ++out;
+        if (out < end)
+                *out = ((c >> 6) & 0x07) + '0';
+        ++out;
+        if (out < end)
+                *out = ((c >> 3) & 0x07) + '0';
+        ++out;
+        if (out < end)
+                *out = ((c >> 0) & 0x07) + '0';
+        ++out;
 
         *dst = out;
-        *osz -= 4;
-
-        return 1;
+        return true;
 }
 
-static int escape_hex(unsigned char c, char **dst, size_t *osz)
+static bool escape_hex(unsigned char c, char **dst, char *end)
 {
         char *out = *dst;
 
-        if (*osz < 4)
-                return -ENOMEM;
-
-        *out++ = '\\';
-        *out++ = 'x';
-        *out++ = hex_asc_hi(c);
-        *out++ = hex_asc_lo(c);
+        if (out < end)
+                *out = '\\';
+        ++out;
+        if (out < end)
+                *out = 'x';
+        ++out;
+        if (out < end)
+                *out = hex_asc_hi(c);
+        ++out;
+        if (out < end)
+                *out = hex_asc_lo(c);
+        ++out;
 
         *dst = out;
-        *osz -= 4;
-
-        return 1;
+        return true;
 }
 
 /**
@@ -426,19 +424,17 @@ static int escape_hex(unsigned char c, char **dst, size_t *osz)
  * it if needs.
  *
  * Return:
- * The amount of the characters processed to the destination buffer, or
- * %-ENOMEM if the size of buffer is not enough to put an escaped character is
- * returned.
- *
- * Even in the case of error @dst pointer will be updated to point to the byte
- * after the last processed character.
+ * The total size of the escaped output that would be generated for
+ * the given input and flags. To check whether the output was
+ * truncated, compare the return value to osz. There is room left in
+ * dst for a '\0' terminator if and only if ret < osz.
  */
-int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz,
+int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
                       unsigned int flags, const char *esc)
 {
-        char *out = *dst, *p = out;
+        char *p = dst;
+        char *end = p + osz;
         bool is_dict = esc && *esc;
-        int ret = 0;
 
         while (isz--) {
                 unsigned char c = *src++;
@@ -458,55 +454,26 @@ int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz,
                     (is_dict && !strchr(esc, c))) {
                         /* do nothing */
                 } else {
-                        if (flags & ESCAPE_SPACE) {
-                                ret = escape_space(c, &p, &osz);
-                                if (ret < 0)
-                                        break;
-                                if (ret > 0)
-                                        continue;
-                        }
-
-                        if (flags & ESCAPE_SPECIAL) {
-                                ret = escape_special(c, &p, &osz);
-                                if (ret < 0)
-                                        break;
-                                if (ret > 0)
-                                        continue;
-                        }
-
-                        if (flags & ESCAPE_NULL) {
-                                ret = escape_null(c, &p, &osz);
-                                if (ret < 0)
-                                        break;
-                                if (ret > 0)
-                                        continue;
-                        }
+                        if (flags & ESCAPE_SPACE && escape_space(c, &p, end))
+                                continue;
+
+                        if (flags & ESCAPE_SPECIAL && escape_special(c, &p, end))
+                                continue;
+
+                        if (flags & ESCAPE_NULL && escape_null(c, &p, end))
+                                continue;
 
                         /* ESCAPE_OCTAL and ESCAPE_HEX always go last */
-                        if (flags & ESCAPE_OCTAL) {
-                                ret = escape_octal(c, &p, &osz);
-                                if (ret < 0)
-                                        break;
+                        if (flags & ESCAPE_OCTAL && escape_octal(c, &p, end))
                                 continue;
-                        }
-                        if (flags & ESCAPE_HEX) {
-                                ret = escape_hex(c, &p, &osz);
-                                if (ret < 0)
-                                        break;
+
+                        if (flags & ESCAPE_HEX && escape_hex(c, &p, end))
                                 continue;
-                        }
                 }
 
-                ret = escape_passthrough(c, &p, &osz);
-                if (ret < 0)
-                        break;
+                escape_passthrough(c, &p, end);
         }
 
-        *dst = p;
-
-        if (ret < 0)
-                return ret;
-
-        return p - out;
+        return p - dst;
 }
 EXPORT_SYMBOL(string_escape_mem);
diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
index daf29a390a89..9846ff7428b3 100644
--- a/lib/test-hexdump.c
+++ b/lib/test-hexdump.c
@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
 
 static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
 
-static const char *test_data_1_le[] __initconst = {
+static const char * const test_data_1_le[] __initconst = {
         "be", "32", "db", "7b", "0a", "18", "93", "b2",
         "70", "ba", "c4", "24", "7d", "83", "34", "9b",
         "a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
         "4c", "d1", "19", "99", "43", "b1", "af", "0c",
 };
 
-static const char *test_data_2_le[] __initconst = {
+static const char *test_data_2_le[] __initdata = {
         "32be", "7bdb", "180a", "b293",
         "ba70", "24c4", "837d", "9b34",
         "9ca6", "ad31", "0f9c", "e9ac",
         "d14c", "9919", "b143", "0caf",
 };
 
-static const char *test_data_4_le[] __initconst = {
+static const char *test_data_4_le[] __initdata = {
         "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
         "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
 };
 
-static const char *test_data_8_le[] __initconst = {
+static const char *test_data_8_le[] __initdata = {
         "b293180a7bdb32be", "9b34837d24c4ba70",
         "e9ac0f9cad319ca6", "0cafb1439919d14c",
 };
diff --git a/lib/test-string_helpers.c b/lib/test-string_helpers.c
index ab0d30e1e18f..8e376efd88a4 100644
--- a/lib/test-string_helpers.c
+++ b/lib/test-string_helpers.c
@@ -260,16 +260,28 @@ static __init const char *test_string_find_match(const struct test_string_2 *s2,
         return NULL;
 }
 
+static __init void
+test_string_escape_overflow(const char *in, int p, unsigned int flags, const char *esc,
+                            int q_test, const char *name)
+{
+        int q_real;
+
+        q_real = string_escape_mem(in, p, NULL, 0, flags, esc);
+        if (q_real != q_test)
+                pr_warn("Test '%s' failed: flags = %u, osz = 0, expected %d, got %d\n",
+                        name, flags, q_test, q_real);
+}
+
 static __init void test_string_escape(const char *name,
                                       const struct test_string_2 *s2,
                                       unsigned int flags, const char *esc)
 {
-        int q_real = 512;
-        char *out_test = kmalloc(q_real, GFP_KERNEL);
-        char *out_real = kmalloc(q_real, GFP_KERNEL);
+        size_t out_size = 512;
+        char *out_test = kmalloc(out_size, GFP_KERNEL);
+        char *out_real = kmalloc(out_size, GFP_KERNEL);
         char *in = kmalloc(256, GFP_KERNEL);
-        char *buf = out_real;
         int p = 0, q_test = 0;
+        int q_real;
 
         if (!out_test || !out_real || !in)
                 goto out;
@@ -301,29 +313,19 @@ static __init void test_string_escape(const char *name,
                 q_test += len;
         }
 
-        q_real = string_escape_mem(in, p, &buf, q_real, flags, esc);
+        q_real = string_escape_mem(in, p, out_real, out_size, flags, esc);
 
         test_string_check_buf(name, flags, in, p, out_real, q_real, out_test,
                               q_test);
+
+        test_string_escape_overflow(in, p, flags, esc, q_test, name);
+
 out:
         kfree(in);
         kfree(out_real);
         kfree(out_test);
 }
 
-static __init void test_string_escape_nomem(void)
-{
-        char *in = "\eb \\C\007\"\x90\r]";
-        char out[64], *buf = out;
-        int rc = -ENOMEM, ret;
-
-        ret = string_escape_str_any_np(in, &buf, strlen(in), NULL);
-        if (ret == rc)
-                return;
-
-        pr_err("Test 'escape nomem' failed: got %d instead of %d\n", ret, rc);
-}
-
 static int __init test_string_helpers_init(void)
 {
         unsigned int i;
@@ -342,8 +344,6 @@ static int __init test_string_helpers_init(void)
         for (i = 0; i < (ESCAPE_ANY_NP | ESCAPE_HEX) + 1; i++)
                 test_string_escape("escape 1", escape1, i, TEST_STRING_2_DICT_1);
 
-        test_string_escape_nomem();
-
         return -EINVAL;
 }
 module_init(test_string_helpers_init);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b235c96167d3..3a1e0843f9a2 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdarg.h>
+#include <linux/clk-provider.h>
 #include <linux/module.h>       /* for KSYM_SYMBOL_LEN */
 #include <linux/types.h>
 #include <linux/string.h>
@@ -340,11 +341,11 @@ int num_to_str(char *buf, int size, unsigned long long num)
         return len;
 }
 
-#define ZEROPAD 1               /* pad with zero */
-#define SIGN    2               /* unsigned/signed long */
+#define SIGN    1               /* unsigned/signed, must be 1 */
+#define LEFT    2               /* left justified */
 #define PLUS    4               /* show plus */
 #define SPACE   8               /* space if plus */
-#define LEFT    16              /* left justified */
+#define ZEROPAD 16              /* pad with zero, must be 16 == '0' - ' ' */
 #define SMALL   32              /* use lowercase in hex (must be 32 == 0x20) */
 #define SPECIAL 64              /* prefix hex with "0x", octal with "0" */
 
@@ -383,10 +384,7 @@ static noinline_for_stack
 char *number(char *buf, char *end, unsigned long long num,
              struct printf_spec spec)
 {
-        /* we are called with base 8, 10 or 16, only, thus don't need "G..."  */
-        static const char digits[16] = "0123456789ABCDEF"; /* "GHIJKLMNOPQRSTUVWXYZ"; */
-
-        char tmp[66];
+        char tmp[3 * sizeof(num)];
         char sign;
         char locase;
         int need_pfx = ((spec.flags & SPECIAL) && spec.base != 10);
@@ -422,12 +420,7 @@ char *number(char *buf, char *end, unsigned long long num,
         /* generate full string in tmp[], in reverse order */
         i = 0;
         if (num < spec.base)
-                tmp[i++] = digits[num] | locase;
-        /* Generic code, for any base:
-        else do {
-                tmp[i++] = (digits[do_div(num,base)] | locase);
-        } while (num != 0);
-        */
+                tmp[i++] = hex_asc_upper[num] | locase;
         else if (spec.base != 10) { /* 8 or 16 */
                 int mask = spec.base - 1;
                 int shift = 3;
@@ -435,7 +428,7 @@ char *number(char *buf, char *end, unsigned long long num,
                 if (spec.base == 16)
                         shift = 4;
                 do {
-                        tmp[i++] = (digits[((unsigned char)num) & mask] | locase);
+                        tmp[i++] = (hex_asc_upper[((unsigned char)num) & mask] | locase);
                         num >>= shift;
                 } while (num);
         } else { /* base 10 */
@@ -447,7 +440,7 @@ char *number(char *buf, char *end, unsigned long long num,
                 spec.precision = i;
         /* leading space padding */
         spec.field_width -= spec.precision;
-        if (!(spec.flags & (ZEROPAD+LEFT))) {
+        if (!(spec.flags & (ZEROPAD | LEFT))) {
                 while (--spec.field_width >= 0) {
                         if (buf < end)
                                 *buf = ' ';
@@ -475,7 +468,8 @@ char *number(char *buf, char *end, unsigned long long num,
         }
         /* zero or space padding */
         if (!(spec.flags & LEFT)) {
-                char c = (spec.flags & ZEROPAD) ? '0' : ' ';
+                char c = ' ' + (spec.flags & ZEROPAD);
+                BUILD_BUG_ON(' ' + ZEROPAD != '0');
                 while (--spec.field_width >= 0) {
                         if (buf < end)
                                 *buf = c;
@@ -783,11 +777,19 @@ char *hex_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
         if (spec.field_width > 0)
                 len = min_t(int, spec.field_width, 64);
 
-        for (i = 0; i < len && buf < end - 1; i++) {
-                buf = hex_byte_pack(buf, addr[i]);
+        for (i = 0; i < len; ++i) {
+                if (buf < end)
+                        *buf = hex_asc_hi(addr[i]);
+                ++buf;
+                if (buf < end)
+                        *buf = hex_asc_lo(addr[i]);
+                ++buf;
 
-                if (buf < end && separator && i != len - 1)
-                        *buf++ = separator;
+                if (separator && i != len - 1) {
+                        if (buf < end)
+                                *buf = separator;
+                        ++buf;
+                }
         }
 
         return buf;
@@ -1233,8 +1235,12 @@ char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
 
         len = spec.field_width < 0 ? 1 : spec.field_width;
 
-        /* Ignore the error. We print as many characters as we can */
-        string_escape_mem(addr, len, &buf, end - buf, flags, NULL);
+        /*
+         * string_escape_mem() writes as many characters as it can to
+         * the given buffer, and returns the total size of the output
+         * had the buffer been big enough.
+         */
+        buf += string_escape_mem(addr, len, buf, buf < end ? end - buf : 0, flags, NULL);
 
         return buf;
 }
@@ -1322,6 +1328,30 @@ char *address_val(char *buf, char *end, const void *addr,
         return number(buf, end, num, spec);
 }
 
+static noinline_for_stack
+char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
+            const char *fmt)
+{
+        if (!IS_ENABLED(CONFIG_HAVE_CLK) || !clk)
+                return string(buf, end, NULL, spec);
+
+        switch (fmt[1]) {
+        case 'r':
+                return number(buf, end, clk_get_rate(clk), spec);
+
+        case 'n':
+        default:
+#ifdef CONFIG_COMMON_CLK
+                return string(buf, end, __clk_get_name(clk), spec);
+#else
+                spec.base = 16;
+                spec.field_width = sizeof(unsigned long) * 2 + 2;
+                spec.flags |= SPECIAL | SMALL | ZEROPAD;
+                return number(buf, end, (unsigned long)clk, spec);
+#endif
+        }
+}
+
 int kptr_restrict __read_mostly;
 
 /*
@@ -1404,6 +1434,11 @@ int kptr_restrict __read_mostly;
  *           (default assumed to be phys_addr_t, passed by reference)
  * - 'd[234]' For a dentry name (optionally 2-4 last components)
  * - 'D[234]' Same as 'd' but for a struct file
+ * - 'C' For a clock, it prints the name (Common Clock Framework) or address
+ *       (legacy clock framework) of the clock
+ * - 'Cn' For a clock, it prints the name (Common Clock Framework) or address
+ *        (legacy clock framework) of the clock
+ * - 'Cr' For a clock, it prints the current rate of the clock
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -1548,6 +1583,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                 return address_val(buf, end, ptr, spec, fmt);
         case 'd':
                 return dentry_name(buf, end, ptr, spec, fmt);
+        case 'C':
+                return clock(buf, end, ptr, spec, fmt);
         case 'D':
                 return dentry_name(buf, end,
                                    ((const struct file *)ptr)->f_path.dentry,
@@ -1738,29 +1775,21 @@ qualifier:
         if (spec->qualifier == 'L')
                 spec->type = FORMAT_TYPE_LONG_LONG;
         else if (spec->qualifier == 'l') {
-                if (spec->flags & SIGN)
-                        spec->type = FORMAT_TYPE_LONG;
-                else
-                        spec->type = FORMAT_TYPE_ULONG;
+                BUILD_BUG_ON(FORMAT_TYPE_ULONG + SIGN != FORMAT_TYPE_LONG);
+                spec->type = FORMAT_TYPE_ULONG + (spec->flags & SIGN);
         } else if (_tolower(spec->qualifier) == 'z') {
                 spec->type = FORMAT_TYPE_SIZE_T;
         } else if (spec->qualifier == 't') {
                 spec->type = FORMAT_TYPE_PTRDIFF;
         } else if (spec->qualifier == 'H') {
-                if (spec->flags & SIGN)
-                        spec->type = FORMAT_TYPE_BYTE;
-                else
-                        spec->type = FORMAT_TYPE_UBYTE;
+                BUILD_BUG_ON(FORMAT_TYPE_UBYTE + SIGN != FORMAT_TYPE_BYTE);
+                spec->type = FORMAT_TYPE_UBYTE + (spec->flags & SIGN);
         } else if (spec->qualifier == 'h') {
-                if (spec->flags & SIGN)
-                        spec->type = FORMAT_TYPE_SHORT;
-                else
-                        spec->type = FORMAT_TYPE_USHORT;
+                BUILD_BUG_ON(FORMAT_TYPE_USHORT + SIGN != FORMAT_TYPE_SHORT);
+                spec->type = FORMAT_TYPE_USHORT + (spec->flags & SIGN);
         } else {
-                if (spec->flags & SIGN)
-                        spec->type = FORMAT_TYPE_INT;
-                else
-                        spec->type = FORMAT_TYPE_UINT;
+                BUILD_BUG_ON(FORMAT_TYPE_UINT + SIGN != FORMAT_TYPE_INT);
+                spec->type = FORMAT_TYPE_UINT + (spec->flags & SIGN);
         }
 
         return ++fmt - start;
@@ -1800,6 +1829,11 @@ qualifier:
  * %*pE[achnops] print an escaped buffer
  * %*ph[CDN] a variable-length hex string with a separator (supports up to 64
  *           bytes of the input)
+ * %pC output the name (Common Clock Framework) or address (legacy clock
+ *     framework) of a clock
+ * %pCn output the name (Common Clock Framework) or address (legacy clock
+ *      framework) of a clock
+ * %pCr output the current rate of a clock
  * %n is ignored
  *
  * ** Please update Documentation/printk-formats.txt when making changes **