Merge tag 'printk-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

Pull printk updates from Petr Mladek:

 - Allow state reset of printk_once() calls.

 - Prevent crashes when dereferencing invalid pointers in vsprintf().
   Only the first byte is checked for simplicity.

 - Make vsprintf warnings consistent and inlined.

 - Treewide conversion of obsolete %pf, %pF to %ps, %pF printf
   modifiers.

 - Some clean up of vsprintf and test_printf code.

* tag 'printk-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  lib/vsprintf: Make function pointer_string static
  vsprintf: Limit the length of inlined error messages
  vsprintf: Avoid confusion between invalid address and value
  vsprintf: Prevent crash when dereferencing invalid pointers
  vsprintf: Consolidate handling of unknown pointer specifiers
  vsprintf: Factor out %pO handler as kobject_string()
  vsprintf: Factor out %pV handler as va_format()
  vsprintf: Factor out %p[iI] handler as ip_addr_string()
  vsprintf: Do not check address of well-known strings
  vsprintf: Consistent %pK handling for kptr_restrict == 0
  vsprintf: Shuffle restricted_pointer()
  printk: Tie printk_once / printk_deferred_once into .data.once for reset
  treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively
  lib/test_printf: Switch to bitmap_zalloc()

1 files changed, 6 insertions, 6 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index e7665cf914b1..a48f520c2d01 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -702,7 +702,7 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
 {
         phys_addr_t end = base + size - 1;
 
-        memblock_dbg("memblock_add: [%pa-%pa] %pF\n",
+        memblock_dbg("memblock_add: [%pa-%pa] %pS\n",
                      &base, &end, (void *)_RET_IP_);
 
         return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);
@@ -821,7 +821,7 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
 {
         phys_addr_t end = base + size - 1;
 
-        memblock_dbg("   memblock_free: [%pa-%pa] %pF\n",
+        memblock_dbg("   memblock_free: [%pa-%pa] %pS\n",
                      &base, &end, (void *)_RET_IP_);
 
         kmemleak_free_part_phys(base, size);
@@ -832,7 +832,7 @@ int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
 {
         phys_addr_t end = base + size - 1;
 
-        memblock_dbg("memblock_reserve: [%pa-%pa] %pF\n",
+        memblock_dbg("memblock_reserve: [%pa-%pa] %pS\n",
                      &base, &end, (void *)_RET_IP_);
 
         return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0);
@@ -1447,7 +1447,7 @@ void * __init memblock_alloc_try_nid_raw(
 {
         void *ptr;
 
-        memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
+        memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
                      __func__, (u64)size, (u64)align, nid, &min_addr,
                      &max_addr, (void *)_RET_IP_);
 
@@ -1483,7 +1483,7 @@ void * __init memblock_alloc_try_nid(
 {
         void *ptr;
 
-        memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
+        memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
                      __func__, (u64)size, (u64)align, nid, &min_addr,
                      &max_addr, (void *)_RET_IP_);
         ptr = memblock_alloc_internal(size, align,
@@ -1508,7 +1508,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
         phys_addr_t cursor, end;
 
         end = base + size - 1;
-        memblock_dbg("%s: [%pa-%pa] %pF\n",
+        memblock_dbg("%s: [%pa-%pa] %pS\n",
                      __func__, &base, &end, (void *)_RET_IP_);
         kmemleak_free_part_phys(base, size);
         cursor = PFN_UP(base);