You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From e84f9fbbece1585f45a03ccc11eeabe121cadc1b Mon Sep 17 00:00:00 2001
|
|
From: Masahiro Yamada <yamada.masahiro@socionext.com>
|
|
Date: Fri, 15 Nov 2019 02:42:22 +0900
|
|
Subject: [PATCH] modpost: refactor namespace_from_kstrtabns() to not hard-code
|
|
section name
|
|
|
|
Currently, namespace_from_kstrtabns() relies on the fact that
|
|
namespace strings are recorded in the __ksymtab_strings section.
|
|
Actually, it is coded in include/linux/export.h, but modpost does
|
|
not need to hard-code the section name.
|
|
|
|
Elf_Sym::st_shndx holds the index of the relevant section. Using it is
|
|
a more portable way to get the namespace string.
|
|
|
|
Make namespace_from_kstrtabns() simply call sym_get_data(), and delete
|
|
the info->ksymtab_strings .
|
|
|
|
While I was here, I added more 'const' qualifiers to pointers.
|
|
|
|
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
|
|
---
|
|
scripts/mod/modpost.c | 10 +++-------
|
|
scripts/mod/modpost.h | 1 -
|
|
2 files changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
--- a/scripts/mod/modpost.c
|
|
+++ b/scripts/mod/modpost.c
|
|
@@ -360,10 +360,10 @@ static enum export export_from_sec(struc
|
|
return export_unknown;
|
|
}
|
|
|
|
-static const char *namespace_from_kstrtabns(struct elf_info *info,
|
|
- Elf_Sym *kstrtabns)
|
|
+static const char *namespace_from_kstrtabns(const struct elf_info *info,
|
|
+ const Elf_Sym *sym)
|
|
{
|
|
- char *value = info->ksymtab_strings + kstrtabns->st_value;
|
|
+ const char *value = sym_get_data(info, sym);
|
|
return value[0] ? value : NULL;
|
|
}
|
|
|
|
@@ -605,10 +605,6 @@ static int parse_elf(struct elf_info *in
|
|
info->export_unused_gpl_sec = i;
|
|
else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
|
|
info->export_gpl_future_sec = i;
|
|
- else if (strcmp(secname, "__ksymtab_strings") == 0)
|
|
- info->ksymtab_strings = (void *)hdr +
|
|
- sechdrs[i].sh_offset -
|
|
- sechdrs[i].sh_addr;
|
|
|
|
if (sechdrs[i].sh_type == SHT_SYMTAB) {
|
|
unsigned int sh_link_idx;
|
|
--- a/scripts/mod/modpost.h
|
|
+++ b/scripts/mod/modpost.h
|
|
@@ -143,7 +143,6 @@ struct elf_info {
|
|
Elf_Section export_gpl_sec;
|
|
Elf_Section export_unused_gpl_sec;
|
|
Elf_Section export_gpl_future_sec;
|
|
- char *ksymtab_strings;
|
|
char *strtab;
|
|
char *modinfo;
|
|
unsigned int modinfo_len;
|