UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

module: Sync code of is_arm_mapping_symbol() 

After commit 2e3a10a155 ("ARM: avoid ARM binutils leaking ELF local
symbols") and commit d6b732666a ("modpost: fix undefined behavior of
is_arm_mapping_symbol()"), many differences of is_arm_mapping_symbol()
exist in kernel/module/kallsyms.c and scripts/mod/modpost.c, just sync
the code to keep consistent.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Tiezhu Yang 2023-03-31 17:15:51 +08:00 committed by Luis Chamberlain
parent b4aff7513d
commit 87e5b1e8f2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/module/kallsyms.c
View File

@ -251,8 +251,9 @@ static inline int is_arm_mapping_symbol(const char *str)
{ {
if (str[0] == '.' && str[1] == 'L') if (str[0] == '.' && str[1] == 'L')
return true; return true;
return str[0] == '$' && strchr("axtd", str[1]) && return str[0] == '$' &&
(str[2] == '\0' || str[2] == '.'); (str[1] == 'a' || str[1] == 'd' || str[1] == 't' || str[1] == 'x')
&& (str[2] == '\0' || str[2] == '.');
} }
static const char *kallsyms_symbol_name(struct mod_kallsyms *kallsyms, unsigned int symnum) static const char *kallsyms_symbol_name(struct mod_kallsyms *kallsyms, unsigned int symnum)

2
scripts/mod/modpost.c
View File

@ -1114,6 +1114,8 @@ static int secref_whitelist(const struct sectioncheck *mismatch,
static inline int is_arm_mapping_symbol(const char *str) static inline int is_arm_mapping_symbol(const char *str)
{ {
if (str[0] == '.' && str[1] == 'L')
return true;
return str[0] == '$' && return str[0] == '$' &&
(str[1] == 'a' || str[1] == 'd' || str[1] == 't' || str[1] == 'x') (str[1] == 'a' || str[1] == 'd' || str[1] == 't' || str[1] == 'x')
&& (str[2] == '\0' || str[2] == '.'); && (str[2] == '\0' || str[2] == '.');