1 files changed, 33 insertions, 15 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d7a708f82559..23920c5ff728 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -336,7 +336,7 @@ char *put_dec(char *buf, unsigned long long n)
  *
  * If speed is not important, use snprintf(). It's easy to read the code.
  */
-int num_to_str(char *buf, int size, unsigned long long num)
+int num_to_str(char *buf, int size, unsigned long long num, unsigned int width)
 {
         /* put_dec requires 2-byte alignment of the buffer. */
         char tmp[sizeof(num) * 3] __aligned(2);
@@ -350,11 +350,21 @@ int num_to_str(char *buf, int size, unsigned long long num)
                 len = put_dec(tmp, num) - tmp;
         }
 
-        if (len > size)
+        if (len > size || width > size)
                 return 0;
+
+        if (width > len) {
+                width = width - len;
+                for (idx = 0; idx < width; idx++)
+                        buf[idx] = ' ';
+        } else {
+                width = 0;
+        }
+
         for (idx = 0; idx < len; ++idx)
-                buf[idx] = tmp[len - idx - 1];
-        return len;
+                buf[idx + width] = tmp[len - idx - 1];
+
+        return len + width;
 }
 
 #define SIGN    1               /* unsigned/signed, must be 1 */
@@ -1659,19 +1669,22 @@ char *pointer_string(char *buf, char *end, const void *ptr,
         return number(buf, end, (unsigned long int)ptr, spec);
 }
 
-static bool have_filled_random_ptr_key __read_mostly;
+static DEFINE_STATIC_KEY_TRUE(not_filled_random_ptr_key);
 static siphash_key_t ptr_key __read_mostly;
 
-static void fill_random_ptr_key(struct random_ready_callback *unused)
+static void enable_ptr_key_workfn(struct work_struct *work)
 {
         get_random_bytes(&ptr_key, sizeof(ptr_key));
-        /*
-         * have_filled_random_ptr_key==true is dependent on get_random_bytes().
-         * ptr_to_id() needs to see have_filled_random_ptr_key==true
-         * after get_random_bytes() returns.
-         */
-        smp_mb();
-        WRITE_ONCE(have_filled_random_ptr_key, true);
+        /* Needs to run from preemptible context */
+        static_branch_disable(&not_filled_random_ptr_key);
+}
+
+static DECLARE_WORK(enable_ptr_key_work, enable_ptr_key_workfn);
+
+static void fill_random_ptr_key(struct random_ready_callback *unused)
+{
+        /* This may be in an interrupt handler. */
+        queue_work(system_unbound_wq, &enable_ptr_key_work);
 }
 
 static struct random_ready_callback random_ready = {
@@ -1685,7 +1698,8 @@ static int __init initialize_ptr_random(void)
         if (!ret) {
                 return 0;
         } else if (ret == -EALREADY) {
-                fill_random_ptr_key(&random_ready);
+                /* This is in preemptible context */
+                enable_ptr_key_workfn(&enable_ptr_key_work);
                 return 0;
         }
 
@@ -1699,7 +1713,7 @@ static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec)
         unsigned long hashval;
         const int default_width = 2 * sizeof(ptr);
 
-        if (unlikely(!have_filled_random_ptr_key)) {
+        if (static_branch_unlikely(&not_filled_random_ptr_key)) {
                 spec.field_width = default_width;
                 /* string length must be less than default_width */
                 return string(buf, end, "(ptrval)", spec);
@@ -2591,6 +2605,8 @@ int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args)
                         case 's':
                         case 'F':
                         case 'f':
+                        case 'x':
+                        case 'K':
                                 save_arg(void *);
                                 break;
                         default:
@@ -2765,6 +2781,8 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                         case 's':
                         case 'F':
                         case 'f':
+                        case 'x':
+                        case 'K':
                                 process = true;
                                 break;
                         default: