Skip to content

Commit b5beffa

Browse files
alobakinmasahir0y
authored andcommitted
modpost: fix removing numeric suffixes
With the `-z unique-symbol` linker flag or any similar mechanism, it is possible to trigger the following: ERROR: modpost: "param_set_uint.0" [vmlinux] is a static EXPORT_SYMBOL The reason is that for now the condition from remove_dot(): if (m && (s[n + m] == '.' || s[n + m] == 0)) which was designed to test if it's a dot or a '\0' after the suffix is never satisfied. This is due to that `s[n + m]` always points to the last digit of a numeric suffix, not on the symbol next to it (from a custom debug print added to modpost): param_set_uint.0, s[n + m] is '0', s[n + m + 1] is '\0' So it's off-by-one and was like that since 2014. Fix this for the sake of any potential upcoming features, but don't bother stable-backporting, as it's well hidden -- apart from that LD flag, it can be triggered only with GCC LTO which never landed upstream. Fixes: fcd38ed ("scripts: modpost: fix compilation warning") Signed-off-by: Alexander Lobakin <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 8d3a750 commit b5beffa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/mod/modpost.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1906,7 +1906,7 @@ static char *remove_dot(char *s)
19061906

19071907
if (n && s[n]) {
19081908
size_t m = strspn(s + n + 1, "0123456789");
1909-
if (m && (s[n + m] == '.' || s[n + m] == 0))
1909+
if (m && (s[n + m + 1] == '.' || s[n + m + 1] == 0))
19101910
s[n] = 0;
19111911

19121912
/* strip trailing .prelink */

0 commit comments

Comments
 (0)