mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 04:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

objtool/klp: Remove trailing '_' in demangle_name()

Browse Source 
With CONFIG_LTO_CLANG_THIN, it is possible to have nested __UNIQUE_ID_,
such as:

  __UNIQUE_ID_addressable___UNIQUE_ID_pci_invalid_bar_694_695

To remove both trailing numbers, also remove trailing '_'.

Also add comments to demangle_name().

Signed-off-by: Song Liu <song@kernel.org>
Link: https://patch.msgid.link/20260305231531.3847295-3-song@kernel.org
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
This commit is contained in:
Song Liu
2026-03-05 15:15:26 -08:00
committed by Josh Poimboeuf
parent a1cbaff2ea
commit a3f28d2072
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/objtool/elf.c
View File

@@ -441,6 +441,19 @@ static int read_sections(struct elf *elf)
return 0;
}
/*
* Remove number suffix of a symbol.
*
* Specifically, remove trailing numbers for "__UNIQUE_ID_" symbols and
* symbols with '.'.
*
* With CONFIG_LTO_CLANG_THIN, it is possible to have nested __UNIQUE_ID_,
* such as
*
* __UNIQUE_ID_addressable___UNIQUE_ID_pci_invalid_bar_694_695
*
* to remove both trailing numbers, also remove trailing '_'.
*/
static const char *demangle_name(struct symbol *sym)
{
char *str;
@@ -463,7 +476,7 @@ static const char *demangle_name(struct symbol *sym)
for (int i = strlen(str) - 1; i >= 0; i--) {
char c = str[i];
if (!isdigit(c) && c != '.') {
if (!isdigit(c) && c != '.' && c != '_') {
str[i + 1] = '\0';
break;
}