diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2006-04-24 12:53:43 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-04-30 17:36:48 -0400 |
commit | c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed (patch) | |
tree | b93d91d94d8ec862534ba01200e0c02a83f7d928 /scripts | |
parent | 543f2a3382bd7abd7380903518c61f00c7c87577 (diff) |
kbuild: fix modpost segfault for 64bit mipsel kernel
64bit mips has different r_info layout. This patch fixes modpost
segfault for 64bit little endian mips kernel.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mod/modpost.c | 11 | ||||
-rw-r--r-- | scripts/mod/modpost.h | 19 |
2 files changed, 28 insertions, 2 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cd00e9f07589..fcd4306fa002 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -709,10 +709,17 @@ static void check_sec_ref(struct module *mod, const char *modname, | |||
709 | for (rela = start; rela < stop; rela++) { | 709 | for (rela = start; rela < stop; rela++) { |
710 | Elf_Rela r; | 710 | Elf_Rela r; |
711 | const char *secname; | 711 | const char *secname; |
712 | unsigned int r_sym; | ||
712 | r.r_offset = TO_NATIVE(rela->r_offset); | 713 | r.r_offset = TO_NATIVE(rela->r_offset); |
713 | r.r_info = TO_NATIVE(rela->r_info); | 714 | if (hdr->e_ident[EI_CLASS] == ELFCLASS64 && |
715 | hdr->e_machine == EM_MIPS) { | ||
716 | r_sym = ELF64_MIPS_R_SYM(rela->r_info); | ||
717 | r_sym = TO_NATIVE(r_sym); | ||
718 | } else { | ||
719 | r_sym = ELF_R_SYM(TO_NATIVE(rela->r_info)); | ||
720 | } | ||
714 | r.r_addend = TO_NATIVE(rela->r_addend); | 721 | r.r_addend = TO_NATIVE(rela->r_addend); |
715 | sym = elf->symtab_start + ELF_R_SYM(r.r_info); | 722 | sym = elf->symtab_start + r_sym; |
716 | /* Skip special sections */ | 723 | /* Skip special sections */ |
717 | if (sym->st_shndx >= SHN_LORESERVE) | 724 | if (sym->st_shndx >= SHN_LORESERVE) |
718 | continue; | 725 | continue; |
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index b14255c72a37..89b96c6d8ef5 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h | |||
@@ -39,6 +39,25 @@ | |||
39 | #define ELF_R_TYPE ELF64_R_TYPE | 39 | #define ELF_R_TYPE ELF64_R_TYPE |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | /* The 64-bit MIPS ELF ABI uses an unusual reloc format. */ | ||
43 | typedef struct | ||
44 | { | ||
45 | Elf32_Word r_sym; /* Symbol index */ | ||
46 | unsigned char r_ssym; /* Special symbol for 2nd relocation */ | ||
47 | unsigned char r_type3; /* 3rd relocation type */ | ||
48 | unsigned char r_type2; /* 2nd relocation type */ | ||
49 | unsigned char r_type1; /* 1st relocation type */ | ||
50 | } _Elf64_Mips_R_Info; | ||
51 | |||
52 | typedef union | ||
53 | { | ||
54 | Elf64_Xword r_info_number; | ||
55 | _Elf64_Mips_R_Info r_info_fields; | ||
56 | } _Elf64_Mips_R_Info_union; | ||
57 | |||
58 | #define ELF64_MIPS_R_SYM(i) \ | ||
59 | ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) | ||
60 | |||
42 | #if KERNEL_ELFDATA != HOST_ELFDATA | 61 | #if KERNEL_ELFDATA != HOST_ELFDATA |
43 | 62 | ||
44 | static inline void __endian(const void *src, void *dest, unsigned int size) | 63 | static inline void __endian(const void *src, void *dest, unsigned int size) |