Treat 'p' as a hexadecimal integer with precision equal to the number of
digits in void *.
Signed-off-by: Arvind Sankar <nivedita@xxxxxxxxxxxx>
---
drivers/firmware/efi/libstub/vsprintf.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/firmware/efi/libstub/vsprintf.c b/drivers/firmware/efi/libstub/vsprintf.c
index d7938e44f067..88c503077b92 100644
--- a/drivers/firmware/efi/libstub/vsprintf.c
+++ b/drivers/firmware/efi/libstub/vsprintf.c
@@ -295,9 +295,6 @@ int vsprintf(char *buf, const char *fmt, va_list args)
}
}
- /* default base */
- base = 10;
-
switch (*fmt) {
case 'c':
if (!(flags & LEFT))
@@ -321,21 +318,15 @@ int vsprintf(char *buf, const char *fmt, va_list args)
*str++ = ' ';
continue;
- case 'p':
- if (field_width == -1) {
- field_width = 2 * sizeof(void *);
- flags |= ZEROPAD;
- }
- str = number(str,
- (unsigned long)va_arg(args, void *), 16,
- field_width, precision, flags);
- continue;
-
/* integer number formats - set up the flags and "break" */
case 'o':
base = 8;
break;
+ case 'p':
+ if (precision < 0)
+ precision = 2 * sizeof(void *);
+ fallthrough;
case 'x':
flags |= SMALL;
fallthrough;
@@ -348,6 +339,7 @@ int vsprintf(char *buf, const char *fmt, va_list args)
flags |= SIGN;
fallthrough;
case 'u':
+ base = 10;
break;
default:
@@ -358,7 +350,9 @@ int vsprintf(char *buf, const char *fmt, va_list args)
--fmt;
continue;
}
- if (flags & SIGN) {
+ if (*fmt == 'p')
+ num = (unsigned long)va_arg(args, void *);
+ else if (flags & SIGN) {
switch (qualifier) {
case 'L':
num = va_arg(args, long long);
--
2.26.2
