lib/vsprintf.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 3c1853a9d1c0..032fa8bc5752 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -981,7 +981,7 @@ char *symbol_string(char *buf, char *end, void *ptr, { unsigned long value; #ifdef CONFIG_KALLSYMS - char sym[KSYM_SYMBOL_LEN]; + unsigned long maxlen; #endif if (fmt[1] == 'R') @@ -989,18 +989,22 @@ char *symbol_string(char *buf, char *end, void *ptr, value = (unsigned long)ptr; #ifdef CONFIG_KALLSYMS + maxlen = end - buf; + if (maxlen > spec.precision) + maxlen = spec.precision; + if (*fmt == 'B' && fmt[1] == 'b') - sprint_backtrace_build_id(sym, value); + maxlen = sprint_backtrace_build_id(buf, maxlen, value); else if (*fmt == 'B') - sprint_backtrace(sym, value); + maxlen = sprint_backtrace(buf, maxlen, value); else if (*fmt == 'S' && (fmt[1] == 'b' || (fmt[1] == 'R' && fmt[2] == 'b'))) - sprint_symbol_build_id(sym, value); + maxlen = sprint_symbol_build_id(buf, maxlen, value); else if (*fmt != 's') - sprint_symbol(sym, value); + maxlen = sprint_symbol(buf, maxlen, value); else - sprint_symbol_no_offset(sym, value); + maxlen = sprint_symbol_no_offset(buf, maxlen, value); - return string_nocheck(buf, end, sym, spec); + return widen_string(buf, maxlen, end, spec); #else return special_hex_number(buf, end, value, sizeof(void *)); #endif