Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

torvalds · torvalds · commit b8ec322784f7 · 2008-10-04T12:14:46.000-07:00
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 setup: correct segfault in generation of 32-bit reloc kernel
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
@@ -492,7 +492,7 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
 			continue;
 		}
 		sh_symtab = sec_symtab->symtab;
-		sym_strtab = sec->link->strtab;
+		sym_strtab = sec_symtab->link->strtab;
 		for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
 			Elf32_Rel *rel;
 			Elf32_Sym *sym;

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ static void walk_relocs(void (visit)(Elf32_Rel rel, Elf32_Sym *sym))`
`492`	`492`	`continue;`
`493`	`493`	`}`
`494`	`494`	`sh_symtab = sec_symtab->symtab;`
`495`		`- sym_strtab = sec->link->strtab;`
	`495`	`+ sym_strtab = sec_symtab->link->strtab;`
`496`	`496`	`for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {`
`497`	`497`	`Elf32_Rel *rel;`
`498`	`498`	`Elf32_Sym *sym;`