modpost: drop executable ELF support
PATCH 1/2 modpost: drop executable ELF support
Since commit 269a535ca931 ("modpost: generate vmlinux.symvers and reuse it for the second modpost"), modpost only parses relocatable files (ET_REL).
Signed-off-by Masahiro Yamada <[email protected]>
---
scripts/mod/modpost.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
scripts/mod/modpost.c +4 -6
@@ -321,9 +321,6 @@ static void *sym_get_data_by_offset(const struct elf_info *info, {Elf_Shdr *sechdr = &info->sechdrs[secindex]; -if (info->hdr->e_type !=ET_REL ) - offset -= sechdr->sh_addr; -return (void *)info->hdr + sechdr->sh_offset + offset; }
@@ -477,6 +474,10 @@ static int parse_elf(struct elf_info *info, const char *filename) sechdrs = (void *)hdr + hdr->e_shoff; info->sechdrs = sechdrs; +/* modpost only works for relocatable objects */ +if (hdr->e_type !=ET_REL ) +fatal ("%s: not relocatable object." , filename); +/* Check if file offset is correct */ if (hdr->e_shoff > info->size) { fatal("section header offset=%lu in file '%s' is bigger than filesize=%zu\n",
@@ -1633,9 +1634,6 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)break ;case R_386_PC32 : r->r_addend =TO_NATIVE (*location) +4 ; -/* For CONFIG_RELOCATABLE=y */ -if (elf->hdr->e_type ==ET_EXEC ) - r->r_addend += r->r_offset;break ; }return 0 ;
Signature · 1 line
2.34.1
PATCH 2/2 modpost: use sym_get_data() to get module device_table data
Use sym_get_data() to replace the long code.
Signed-off-by Masahiro Yamada <[email protected]>
---
scripts/mod/file2alias.c | 4 +--- scripts/mod/modpost.c | 2 +- scripts/mod/modpost.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-)
scripts/mod/file2alias.c +1 -3
@@ -1571,9 +1571,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, zeros =calloc (1 , sym->st_size); symval = zeros; }else { - symval = (void *)info->hdr - + info->sechdrs[get_secindex (info, sym)].sh_offset - + sym->st_value; + symval =sym_get_data (info, sym); }/* First handle the "special" cases */
scripts/mod/modpost.c +1 -1
@@ -324,7 +324,7 @@ static void *sym_get_data_by_offset(const struct elf_info *info,return (void *)info->hdr + sechdr->sh_offset + offset; } -static void *sym_get_data (const struct elf_info *info,const Elf_Sym *sym) +void *sym_get_data (const struct elf_info *info,const Elf_Sym *sym) {return sym_get_data_by_offset (info,get_secindex (info, sym), sym->st_value);
scripts/mod/modpost.h +1 -0
@@ -187,6 +187,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen);/* from modpost.c */ char *read_text_file (const char *filename);char *get_line (char **stringp); +void *sym_get_data (const struct elf_info *info,const Elf_Sym *sym);enum loglevel {LOG_WARN ,
Signature · 1 line
2.34.1
Re: [PATCH 2/2] modpost: use sym_get_data() to get module device_table data
Quoted 4 lines · Masahiro Yamada
Use
sym_get_data()to replace the long code.Signed-off-by Masahiro Yamada <[email protected]>
Thanks for the patch!
Reviewed-by Nick Desaulniers <[email protected]>
Quoted 50 lines
---
scripts/mod/file2alias.c | 4 +--- scripts/mod/modpost.c | 2 +- scripts/mod/modpost.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-)scripts/mod/file2alias.c +1
-3@@ -1571,9 +1571,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, zeros =calloc (1 , sym->st_size); symval = zeros; }else { - symval = (void *)info->hdr - + info->sechdrs[get_secindex (info, sym)].sh_offset - + sym->st_value; + symval =sym_get_data (info, sym); }/* First handle the "special" cases */ scripts/mod/modpost.c +1
-1@@ -324,7 +324,7 @@ static void *sym_get_data_by_offset(const struct elf_info *info,return (void *)info->hdr + sechdr->sh_offset + offset; } -static void *sym_get_data (const struct elf_info *info,const Elf_Sym *sym) +void *sym_get_data (const struct elf_info *info,const Elf_Sym *sym) {return sym_get_data_by_offset (info,get_secindex (info, sym), sym->st_value);scripts/mod/modpost.h +1
-1@@ -187,6 +187,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen);/* from modpost.c */ char *read_text_file (const char *filename);char *get_line (char **stringp); +void *sym_get_data (const struct elf_info *info,const Elf_Sym *sym);enum loglevel {LOG_WARN , --2.34.1
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 6 lines · Masahiro Yamada
Since commit
269a535ca931("modpost: generate vmlinux.symvers and reuse it for the second modpost"), modpost only parses relocatable files (ET_REL).Signed-off-by Masahiro Yamada <[email protected]>
Thanks for the patch!
Reviewed-by Nick Desaulniers <[email protected]>
Quoted 43 lines
---
scripts/mod/modpost.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)scripts/mod/modpost.c +4
-7@@ -321,9 +321,6 @@ static void *sym_get_data_by_offset(const struct elf_info *info, {Elf_Shdr *sechdr = &info->sechdrs[secindex]; -if (info->hdr->e_type !=ET_REL ) - offset -= sechdr->sh_addr; -return (void *)info->hdr + sechdr->sh_offset + offset; }@@ -477,6 +474,10 @@ static int parse_elf(struct elf_info *info, const char *filename) sechdrs = (void *)hdr + hdr->e_shoff; info->sechdrs = sechdrs; +/* modpost only works for relocatable objects */ +if (hdr->e_type !=ET_REL ) +fatal ("%s: not relocatable object." , filename); +/* Check if file offset is correct */ if (hdr->e_shoff > info->size) { fatal("section header offset=%lu in file '%s' is bigger than filesize=%zu\n",@@ -1633,9 +1634,6 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)break ;case R_386_PC32 : r->r_addend =TO_NATIVE (*location) +4 ; -/* For CONFIG_RELOCATABLE=y */ -if (elf->hdr->e_type ==ET_EXEC ) - r->r_addend += r->r_offset;break ; }return 0 ; --2.34.1
Signature · 2 lines
Thanks, ~Nick Desaulniers