modpost: Fix modpost's license checking V3 (62a26356) · Commits · 戴 / test

The commit sorts symbols placing each of them in its own elf section. The sorting and merging into the canonical sections are done by the linker. Unfortunately modpost to generate Module.symvers file parses vmlinux (already linked) 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. Thanks to Arnaud Lacombe <lacombar@gmail.com> and Anders Kaseorg <andersk@ksplice.com> for providing useful suggestions about code. This work was supported by a hardware donation from the CE Linux Forum. Reported-by:

Jan Beulich <jbeulich@novell.com> Signed-off-by:

Alessio Igor Bogani <abogani@kernel.org> Signed-off-by:

Rusty Russell <rusty@rustcorp.com.au>

scripts/mod/modpost.c

+28 −1

Original line number	Diff line number	Diff line
		@@ -254,6 +254,28 @@ static enum export export_no(const char *s)
		return export_unknown;
		}

		static const char sec_name(struct elf_info elf, int secindex);

		#define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0)

		static enum export export_from_secname(struct elf_info *elf, unsigned int sec)
		{
		const char *secname = sec_name(elf, sec);

		if (strstarts(secname, "___ksymtab+"))
		return export_plain;
		else if (strstarts(secname, "___ksymtab_unused+"))
		return export_unused;
		else if (strstarts(secname, "___ksymtab_gpl+"))
		return export_gpl;
		else if (strstarts(secname, "___ksymtab_unused_gpl+"))
		return export_unused_gpl;
		else if (strstarts(secname, "___ksymtab_gpl_future+"))
		return export_gpl_future;
		else
		return export_unknown;
		}

		static enum export export_from_sec(struct elf_info *elf, unsigned int sec)
		{
		if (sec == elf->export_sec)
		@@ -563,7 +585,12 @@ static void handle_modversions(struct module mod, struct elf_info info,
		Elf_Sym sym, const char symname)
		{
		unsigned int crc;
		enum export export = export_from_sec(info, get_secindex(info, sym));
		enum export export;

		if (!is_vmlinux(mod->name) && strncmp(symname, "__ksymtab", 9) == 0)
		export = export_from_secname(info, get_secindex(info, sym));
		else
		export = export_from_sec(info, get_secindex(info, sym));

		switch (sym->st_shndx) {
		case SHN_COMMON:

Admin message