43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From: Krzysztof Halasa <khc@pm.waw.pl>
|
|
Date: Thu, 10 Jun 2010 23:08:20 +0000 (+0200)
|
|
Subject: kbuild: Fix modpost segfault
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1c938663d58b5b2965976a6f54cc51b5d6f691aa
|
|
|
|
kbuild: Fix modpost segfault
|
|
|
|
Alan <alan@clueserver.org> writes:
|
|
|
|
> program: /home/alan/GitTrees/linux-2.6-mid-ref/scripts/mod/modpost -o
|
|
> Module.symvers -S vmlinux.o
|
|
>
|
|
> Program received signal SIGSEGV, Segmentation fault.
|
|
|
|
It just hit me.
|
|
It's the offset calculation in reloc_location() which overflows:
|
|
return (void *)elf->hdr + sechdrs[section].sh_offset +
|
|
(r->r_offset - sechdrs[section].sh_addr);
|
|
|
|
E.g. for the first rodata r entry:
|
|
r->r_offset < sechdrs[section].sh_addr
|
|
and the expression in the parenthesis produces 0xFFFFFFE0 or something
|
|
equally wise.
|
|
|
|
Reported-by: Alan <alan@clueserver.org>
|
|
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
|
|
Tested-by: Alan <alan@clueserver.org>
|
|
Signed-off-by: Michal Marek <mmarek@suse.cz>
|
|
---
|
|
|
|
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
|
|
index 3318692..f877900 100644
|
|
--- a/scripts/mod/modpost.c
|
|
+++ b/scripts/mod/modpost.c
|
|
@@ -1342,7 +1342,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
|
|
int section = sechdr->sh_info;
|
|
|
|
return (void *)elf->hdr + sechdrs[section].sh_offset +
|
|
- (r->r_offset - sechdrs[section].sh_addr);
|
|
+ r->r_offset - sechdrs[section].sh_addr;
|
|
}
|
|
|
|
static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
|