From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 May 2019 16:18:12 +0000 (-0700)
Subject: Merge tag 'printk-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek... 
X-Git-Tag: v5.2-rc1~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0968621917add2e0d60c8fbc4e24c670cb14319c;p=thirdparty%2Flinux.git

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()
---

0968621917add2e0d60c8fbc4e24c670cb14319c
diff --cc drivers/base/power/main.c
index 43e863cc0c1b8,c88f56b9ae5ba..10528a7747bf9
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -2051,7 -2062,7 +2051,7 @@@ EXPORT_SYMBOL_GPL(dpm_suspend_start)
  void __suspend_report_result(const char *function, void *fn, int ret)
  {
  	if (ret)
- 		pr_err("%s(): %pF returns %d\n", function, fn, ret);
 -		printk(KERN_ERR "%s(): %pS returns %d\n", function, fn, ret);
++		pr_err("%s(): %pS returns %d\n", function, fn, ret);
  }
  EXPORT_SYMBOL_GPL(__suspend_report_result);
  
diff --cc include/trace/events/sunrpc.h
index 7e899e635d33a,7b8b987d332ee..f0a6f0c5549cc
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -146,10 -102,10 +146,10 @@@ DECLARE_EVENT_CLASS(rpc_task_running
  		__entry->flags = task->tk_flags;
  		),
  
- 	TP_printk("task:%u@%d flags=%s runstate=%s status=%d action=%pf",
 -	TP_printk("task:%u@%d flags=%4.4x state=%4.4lx status=%d action=%ps",
++	TP_printk("task:%u@%d flags=%s runstate=%s status=%d action=%ps",
  		__entry->task_id, __entry->client_id,
 -		__entry->flags,
 -		__entry->runstate,
 +		rpc_show_task_flags(__entry->flags),
 +		rpc_show_runstate(__entry->runstate),
  		__entry->status,
  		__entry->action
  		)