Commit 258f742635360175564e9470eb060ff4d4b984e7
Committed by
Linus Torvalds
Linus Torvalds
1 parent
83dbbdbb38
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
modpost: Fix modpost license checking of vmlinux.o
Commit f02e8a6596b7 ("module: Sort exported symbols") sorts symbols placing each of them in its own elf section. This sorting and merging into the canonical sections are done by the linker. Unfortunately modpost to generate Module.symvers file parses vmlinux.o (which is not linked yet) and all modules object files (which aren't linked yet). These aren't sanitized by the linker yet. That breaks modpost that can't detect license properly for modules. This patch makes modpost aware of the new exported symbols structure. [ This above is a slightly corrected version of the explanation of the problem, copied from commit 62a2635610db ("modpost: Fix modpost's license checking V3"). That commit fixed the problem for module object files, but not for vmlinux.o. This patch fixes modpost for vmlinux.o. ] Signed-off-by: Frank Rowand <frank.rowand@am.sony.com> Signed-off-by: Alessio Igor Bogani <abogani@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 6 additions and 2 deletions Side-by-side Diff
scripts/mod/modpost.c
| ... | ... | @@ -132,8 +132,10 @@ |
| 132 | 132 | /* strip trailing .o */ |
| 133 | 133 | s = strrchr(p, '.'); |
| 134 | 134 | if (s != NULL) |
| 135 | - if (strcmp(s, ".o") == 0) | |
| 135 | + if (strcmp(s, ".o") == 0) { | |
| 136 | 136 | *s = '\0'; |
| 137 | + mod->is_dot_o = 1; | |
| 138 | + } | |
| 137 | 139 | |
| 138 | 140 | /* add to list */ |
| 139 | 141 | mod->name = p; |
| ... | ... | @@ -587,7 +589,8 @@ |
| 587 | 589 | unsigned int crc; |
| 588 | 590 | enum export export; |
| 589 | 591 | |
| 590 | - if (!is_vmlinux(mod->name) && strncmp(symname, "__ksymtab", 9) == 0) | |
| 592 | + if ((!is_vmlinux(mod->name) || mod->is_dot_o) && | |
| 593 | + strncmp(symname, "__ksymtab", 9) == 0) | |
| 591 | 594 | export = export_from_secname(info, get_secindex(info, sym)); |
| 592 | 595 | else |
| 593 | 596 | export = export_from_sec(info, get_secindex(info, sym)); |