On Sun, May 21, 2023 at 9:05 AM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
>
> This check is unneeded. Without it, sec_name() will returns the null
> string "", then section_mismatch() will return immediately.
>
> Anyway, special section indices rarely appear in these loops.
>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
> ---
>
> Changes in v6:
> - Remove is_shndx_special() definition
>
> scripts/mod/modpost.c | 16 ++++------------
> scripts/mod/modpost.h | 5 -----
> 2 files changed, 4 insertions(+), 17 deletions(-)
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index f364738a236e..40fac4f64fcd 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -1361,7 +1361,6 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
> static void section_rela(const char *modname, struct elf_info *elf,
> Elf_Shdr *sechdr)
> {
> - Elf_Sym *sym;
> Elf_Rela *rela;
> Elf_Rela r;
> unsigned int r_sym;
> @@ -1404,11 +1403,8 @@ static void section_rela(const char *modname, struct elf_info *elf,
> continue;
> break;
> }
> - sym = elf->symtab_start + r_sym;
> - /* Skip special sections */
> - if (is_shndx_special(sym->st_shndx))
> - continue;
> - check_section_mismatch(modname, elf, sym,
> +
> + check_section_mismatch(modname, elf, elf->symtab_start + r_sym,
> fsecndx, fromsec, r.r_offset, r.r_addend);
> }
> }
> @@ -1416,7 +1412,6 @@ static void section_rela(const char *modname, struct elf_info *elf,
> static void section_rel(const char *modname, struct elf_info *elf,
> Elf_Shdr *sechdr)
> {
> - Elf_Sym *sym;
> Elf_Rel *rel;
> Elf_Rela r;
> unsigned int r_sym;
> @@ -1463,11 +1458,8 @@ static void section_rel(const char *modname, struct elf_info *elf,
> default:
> fatal("Please add code to calculate addend for this architecture\n");
> }
> - sym = elf->symtab_start + r_sym;
> - /* Skip special sections */
> - if (is_shndx_special(sym->st_shndx))
> - continue;
> - check_section_mismatch(modname, elf, sym,
> +
> + check_section_mismatch(modname, elf, elf->symtab_start + r_sym,
> fsecndx, fromsec, r.r_offset, r.r_addend);
> }
> }
> diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
> index 1178f40a73f3..b1e2d95f8047 100644
> --- a/scripts/mod/modpost.h
> +++ b/scripts/mod/modpost.h
> @@ -151,11 +151,6 @@ struct elf_info {
> Elf32_Word *symtab_shndx_stop;
> };
>
> -static inline int is_shndx_special(unsigned int i)
> -{
> - return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE;
> -}
> -
> /* Accessor for sym->st_shndx, hides ugliness of "64k sections" */
> static inline unsigned int get_secindex(const struct elf_info *info,
> const Elf_Sym *sym)
> --
> 2.39.2
>
--
Thanks,
~Nick Desaulniers
