Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

modpost: remove annoying namespace_from_kstrtabns()

Browse Source 
There are two call sites for sym_update_namespace().

When the symbol has no namespace, s->namespace is set to NULL,
but the conversion from "" to NULL is done in two different places.

[1] read_symbols()

  This gets the namespace from __kstrtabns_<symbol>. If the symbol has
  no namespace, sym_get_data(info, sym) returns the empty string "".
  namespace_from_kstrtabns() converts it to NULL before it is passed to
  sym_update_namespace().

[2] read_dump()

  This gets the namespace from the dump file, *.symvers. If the symbol
  has no namespace, the 'namespace' is the empty string "", which is
  directly passed into sym_update_namespace(). The conversion from
  "" to NULL is done in sym_update_namespace().

namespace_from_kstrtabns() exists only for creating this inconsistency.

Remove namespace_from_kstrtabns() so that sym_update_namespace() is
consistently passed with "" instead of NULL.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
This commit is contained in:
Masahiro Yamada 2022-04-05 20:33:54 +09:00
parent b5f1a52a59
commit 79f646e865
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/mod/modpost.c
View File

@ -369,13 +369,6 @@ static enum export export_from_secname(struct elf_info *elf, unsigned int sec)
return export_unknown; return export_unknown;
} }
static const char *namespace_from_kstrtabns(const struct elf_info *info,
const Elf_Sym *sym)
{
const char *value = sym_get_data(info, sym);
return value[0] ? value : NULL;
}
static void sym_update_namespace(const char *symname, const char *namespace) static void sym_update_namespace(const char *symname, const char *namespace)
{ {
struct symbol *s = find_symbol(symname); struct symbol *s = find_symbol(symname);
@ -391,8 +384,7 @@ static void sym_update_namespace(const char *symname, const char *namespace)
} }
free(s->namespace); free(s->namespace);
s->namespace = s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL;
namespace && namespace[0] ? NOFAIL(strdup(namespace)) : NULL;
} }
/** /**
@ -2049,9 +2041,7 @@ static void read_symbols(const char *modname)
/* Apply symbol namespaces from __kstrtabns_<symbol> entries. */ /* Apply symbol namespaces from __kstrtabns_<symbol> entries. */
if (strstarts(symname, "__kstrtabns_")) if (strstarts(symname, "__kstrtabns_"))
sym_update_namespace(symname + strlen("__kstrtabns_"), sym_update_namespace(symname + strlen("__kstrtabns_"),
namespace_from_kstrtabns(&info, sym_get_data(&info, sym));
sym));
if (strstarts(symname, "__crc_")) if (strstarts(symname, "__crc_"))
handle_modversion(mod, &info, sym, handle_modversion(mod, &info, sym,
symname + strlen("__crc_")); symname + strlen("__crc_"));