Skip to content

Commit 84696cf

Browse files
Villemoespmladek
authored andcommitted
lib/vsprintf.c: remove leftover 'f' and 'F' cases from bstr_printf()
Commit 9af7706 ("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 (3bd32d6, "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: 9af7706 ("lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps") Cc: [email protected] Signed-off-by: Rasmus Villemoes <[email protected]> Reviewed-by: Sakari Ailus <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent a48849e commit 84696cf

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

lib/vsprintf.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3141,8 +3141,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
31413141
switch (*fmt) {
31423142
case 'S':
31433143
case 's':
3144-
case 'F':
3145-
case 'f':
31463144
case 'x':
31473145
case 'K':
31483146
case 'e':

0 commit comments

Comments
 (0)