forked from luck/tmp_suning_uos_patched
modpost: make updating the symbol namespace explicit
Setting the symbol namespace of a symbol within sym_add_exported feels displaced and lead to issues in the current implementation of symbol namespaces. This patch makes updating the namespace an explicit call to decouple it from adding a symbol to the export list. Acked-by: Will Deacon <will@kernel.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Matthias Maennich <maennich@google.com> Signed-off-by: Jessica Yu <jeyu@kernel.org>
This commit is contained in:
parent
a2b1118438
commit
9ae5bd1847
|
@ -385,8 +385,8 @@ static void sym_update_namespace(const char *symname, const char *namespace)
|
|||
* Add an exported symbol - it may have already been added without a
|
||||
* CRC, in this case just update the CRC
|
||||
**/
|
||||
static struct symbol *sym_add_exported(const char *name, const char *namespace,
|
||||
struct module *mod, enum export export)
|
||||
static struct symbol *sym_add_exported(const char *name, struct module *mod,
|
||||
enum export export)
|
||||
{
|
||||
struct symbol *s = find_symbol(name);
|
||||
|
||||
|
@ -402,7 +402,6 @@ static struct symbol *sym_add_exported(const char *name, const char *namespace,
|
|||
s->module = mod;
|
||||
}
|
||||
}
|
||||
sym_update_namespace(name, namespace);
|
||||
s->preloaded = 0;
|
||||
s->vmlinux = is_vmlinux(mod->name);
|
||||
s->kernel = 0;
|
||||
|
@ -764,7 +763,8 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
|
|||
if (strstarts(symname, "__ksymtab_")) {
|
||||
name = symname + strlen("__ksymtab_");
|
||||
namespace = sym_extract_namespace(&name);
|
||||
sym_add_exported(name, namespace, mod, export);
|
||||
sym_add_exported(name, mod, export);
|
||||
sym_update_namespace(name, namespace);
|
||||
free(namespace);
|
||||
}
|
||||
if (strcmp(symname, "init_module") == 0)
|
||||
|
@ -2472,12 +2472,12 @@ static void read_dump(const char *fname, unsigned int kernel)
|
|||
mod = new_module(modname);
|
||||
mod->skip = 1;
|
||||
}
|
||||
s = sym_add_exported(symname, namespace, mod,
|
||||
export_no(export));
|
||||
s = sym_add_exported(symname, mod, export_no(export));
|
||||
s->kernel = kernel;
|
||||
s->preloaded = 1;
|
||||
s->is_static = 0;
|
||||
sym_update_crc(symname, mod, crc, export_no(export));
|
||||
sym_update_namespace(symname, namespace);
|
||||
}
|
||||
release_file(file, size);
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue
Block a user