[PATCH 3.17 017/122] x86, kaslr: Handle Gold linker for finding bss/brk
3.17-stable review patch. If anyone has any objections, please let me know.
--
From: Kees Cook
commit 70b61e362187b5fccac206506d402f3424e3e749 upstream.
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
Signed-off-by: Kees Cook
Cc: Junjie Mao
Link: http://lkml.kernel.org/r/20141118001604.ga25...@www.outflux.net
Signed-off-by: Thomas Gleixner
Signed-off-by: Greg Kroah-Hartman
---
arch/x86/tools/calc_run_size.pl | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- a/arch/x86/tools/calc_run_size.pl
+++ b/arch/x86/tools/calc_run_size.pl
@@ -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";
}
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.17 017/122] x86, kaslr: Handle Gold linker for finding bss/brk
3.17-stable review patch. If anyone has any objections, please let me know.
--
From: Kees Cook keesc...@chromium.org
commit 70b61e362187b5fccac206506d402f3424e3e749 upstream.
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 mar...@trippelsdorf.de
Signed-off-by: Kees Cook keesc...@chromium.org
Cc: Junjie Mao eternal@gmail.com
Link: http://lkml.kernel.org/r/20141118001604.ga25...@www.outflux.net
Signed-off-by: Thomas Gleixner t...@linutronix.de
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org
---
arch/x86/tools/calc_run_size.pl | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- a/arch/x86/tools/calc_run_size.pl
+++ b/arch/x86/tools/calc_run_size.pl
@@ -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;
}
}
}
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
