module: Sync code of is_arm_mapping_symbol()

After commit 2e3a10a1551d ("ARM: avoid ARM binutils leaking ELF local
symbols") and commit d6b732666a1b ("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 <[email protected]>
Signed-off-by: Luis Chamberlain <[email protected]>

diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c
index 3320586584f10fbe4c7649f8521bc74c48e8f243..a9045fe55bcd9f657da94e6b8db20e3fd3df456a 100644 (file)
--- a/kernel/module/kallsyms.c
+++ b/kernel/module/kallsyms.c
@@ -251,8 +251,9 @@ static inline int is_arm_mapping_symbol(const char *str)
 {
        if (str[0] == '.' && str[1] == 'L')
                return true;
-       return str[0] == '$' && strchr("axtd", str[1]) &&
-              (str[2] == '\0' || str[2] == '.');
+       return str[0] == '$' &&
+              (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)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index efff8078e39581349f72fd8fbe6e2c062e36d372..79a27cc5f0b1d99c277e20d3f7cb2635d7a34bf3 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1114,6 +1114,8 @@ static int secref_whitelist(const struct sectioncheck *mismatch,
 
 static inline int is_arm_mapping_symbol(const char *str)
 {
+       if (str[0] == '.' && str[1] == 'L')
+               return true;
        return str[0] == '$' &&
               (str[1] == 'a' || str[1] == 'd' || str[1] == 't' || str[1] == 'x')
               && (str[2] == '\0' || str[2] == '.');