Skip to content

Commit f3f9f42

Browse files
Zheng Yejianojeda
authored andcommitted
kallsyms: Fix wrong "big" kernel symbol type read from procfs
Currently when the length of a symbol is longer than 0x7f characters, its type shown in /proc/kallsyms can be incorrect. I found this issue when reading the code, but it can be reproduced by following steps: 1. Define a function which symbol length is 130 characters: #define X13(x) x##x##x##x##x##x##x##x##x##x##x##x##x static noinline void X13(x123456789)(void) { printk("hello world\n"); } 2. The type in vmlinux is 't': $ nm vmlinux | grep x123456 ffffffff816290f0 t x123456789x123456789x123456789x12[...] 3. Then boot the kernel, the type shown in /proc/kallsyms becomes 'g' instead of the expected 't': # cat /proc/kallsyms | grep x123456 ffffffff816290f0 g x123456789x123456789x123456789x12[...] The root cause is that, after commit 73bbb94 ("kallsyms: support "big" kernel symbols"), ULEB128 was used to encode symbol name length. That is, for "big" kernel symbols of which name length is longer than 0x7f characters, the length info is encoded into 2 bytes. kallsyms_get_symbol_type() expects to read the first char of the symbol name which indicates the symbol type. However, due to the "big" symbol case not being handled, the symbol type read from /proc/kallsyms may be wrong, so handle it properly. Cc: [email protected] Fixes: 73bbb94 ("kallsyms: support "big" kernel symbols") Signed-off-by: Zheng Yejian <[email protected]> Acked-by: Gary Guo <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 841f31d commit f3f9f42

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

kernel/kallsyms.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,11 @@ static char kallsyms_get_symbol_type(unsigned int off)
103103
{
104104
/*
105105
* Get just the first code, look it up in the token table,
106-
* and return the first char from this token.
106+
* and return the first char from this token. If MSB of length
107+
* is 1, it is a "big" symbol, so needs an additional byte.
107108
*/
109+
if (kallsyms_names[off] & 0x80)
110+
off++;
108111
return kallsyms_token_table[kallsyms_token_index[kallsyms_names[off + 1]]];
109112
}
110113

0 commit comments

Comments
 (0)