x86, kaslr: handle Gold linker for finding bss+brk
PATCH 1/1 x86, kaslr: handle Gold linker for finding bss+brk
When building with the Gold linker, the .bss and .brk areas of vmlinux are shown as consecutive instead of having the same file offset. Allow for either state, as long as things add up correctly.
Fixes e6023367d779 ("x86, kaslr: Prevent .bss from overlaping initrd")
Reported-by Markus Trippelsdorf <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Cc Junjie Mao <[email protected]>
--- arch/x86/tools/calc_run_size.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/x86/tools/calc_run_size.pl +10 -1
@@ -19,7 +19,16 @@ while (<>) { if ($file_offset == 0) { $file_offset = $offset; } elsif ($file_offset != $offset) { - die ".bss and .brk lack common file offset\n"; + # BFD linker shows the same file offset in ELF. + # Gold linker shows them as consecutive. + next if ($file_offset + $mem_size == $offset + $size); + + printf STDERR "file_offset: 0x%lx\n", $file_offset; + printf STDERR "mem_size: 0x%lx\n", $mem_size; + printf STDERR "offset: 0x%lx\n", $offset; + printf STDERR "size: 0x%lx\n", $size; + + die ".bss and .brk are non-contiguous\n"; } } }
Signature · 6 lines
1.9.1 -- Kees Cook Chrome OS Security
tip-bot for Kees Cook
merge bot[tip:x86/urgent] x86, kaslr: Handle Gold linker for finding bss/ brk
x86, kaslr: Handle Gold linker for finding bss/brk
Commit-ID: 70b61e362187b5fccac206506d402f3424e3e749 Gitweb: http://git.kernel.org/tip/70b61e362187b5fccac206506d402f3424e3e749 Author: Kees Cook <[email protected]> AuthorDate: Mon, 17 Nov 2014 16:16:04 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 18 Nov 2014 18:32:24 +0100
x86, kaslr: Handle Gold linker for finding bss/brk
When building with the Gold linker, the .bss and .brk areas of vmlinux are shown as consecutive instead of having the same file offset. Allow for either state, as long as things add up correctly.
Fixes e6023367d779 ("x86, kaslr: Prevent .bss from overlaping initrd")
Reported-by Markus Trippelsdorf <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Cc Junjie Mao <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/x86/tools/calc_run_size.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/x86/tools/calc_run_size.pl +10 -1
@@ -19,7 +19,16 @@ while (<>) { if ($file_offset == 0) { $file_offset = $offset; } elsif ($file_offset != $offset) { - die ".bss and .brk lack common file offset\n"; + # BFD linker shows the same file offset in ELF. + # Gold linker shows them as consecutive. + next if ($file_offset + $mem_size == $offset + $size); + + printf STDERR "file_offset: 0x%lx\n", $file_offset; + printf STDERR "mem_size: 0x%lx\n", $mem_size; + printf STDERR "offset: 0x%lx\n", $offset; + printf STDERR "size: 0x%lx\n", $size; + + die ".bss and .brk are non-contiguous\n"; } } }