path: root/lib
diff options
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2021-04-23 11:45:29 +0200
committerPetr Mladek <pmladek@suse.com>2021-04-23 16:43:23 +0200
commit84696cfaf4d90945eb2a8302edc6cf627db56b84 (patch)
treefd39be65309ba73a4f7938e57d05f47ec036b291 /lib
parenta48849e2358ecf1a347a03b33dc27b9b2f25f8fd (diff)
lib/vsprintf.c: remove leftover 'f' and 'F' cases from bstr_printf()
Commit 9af7706492f9 ("lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps") removed support for %pF and %pf, and correctly removed the handling of those cases in vbin_printf(). However, the corresponding cases in bstr_printf() were left behind. In the same series, %pf was re-purposed for dealing with fwnodes (3bd32d6a2ee6, "lib/vsprintf: Add %pfw conversion specifier for printing fwnode names"). So should anyone use %pf with the binary printf routines, vbin_printf() would (correctly, as it involves dereferencing the pointer) do the string formatting to the u32 array, but bstr_printf() would not copy the string from the u32 array, but instead interpret the first sizeof(void*) bytes of the formatted string as a pointer - which generally won't end well (also, all subsequent get_args would be out of sync). Fixes: 9af7706492f9 ("lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps") Cc: stable@vger.kernel.org Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20210423094529.1862521-1-linux@rasmusvillemoes.dk
Diffstat (limited to 'lib')
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 5ec8ad238d03..7caf619ee9c2 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -3141,8 +3141,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
switch (*fmt) {
case 'S':
case 's':
- case 'F':
- case 'f':
case 'x':
case 'K':
case 'e':