* kaslr relocation incompitable with kernel loaded high @ 2014-04-21 10:52 WANG Chao 2014-04-21 17:56 ` Yinghai Lu 0 siblings, 1 reply; 8+ messages in thread From: WANG Chao @ 2014-04-21 10:52 UTC (permalink / raw) To: Kees Cook, H. Peter Anvin, Yinghai Lu, Zhang Yanfei, Vivek Goyal Cc: linux-kernel Hi, Kees When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded high, it doesn't boot. I reserved 128M memory at high with kernel cmdline "crashkernel=128M,high crashkernel=0,low", and for which I got: [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) Then I load kdump kernel into the reserved memory region, using a local modified kexec-tools which is passing e820 in boot_params. The e820 map of system RAM passed to 2nd kernel: E820 memmap (of RAM): 0000000000001000-000000000009e3ff (1) 00000001af000000-00000001b6f5dfff (1) 00000001b6fff400-00000001b6ffffff (1) In which, 2nd kernel is loaded at 0x1b5000000. After triggerred a system crash, 2nd kernel doesn't boot even with "nokaslr" cmdline: # echo c > /proc/sysrq-trigger [..] I'm in purgatory early console in decompress_kernel KASLR disabled... Decompressing Linux... Parsing ELF... Performing relocations... 32-bit relocation outside of kernel! -- System halted I know 32bit relocation code has recently moved to misc.c and it's a ground work for kaslr on x86_64. However it doesn't work out on a kernel high loaded case. I'm not quite familiar with this. But I'm wondering if it makes sense to skip handle_relocation() if kaslr doesn't take effects (nokaslr or kaslr failed to find suitable area). Thanks WANG Chao ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-21 10:52 kaslr relocation incompitable with kernel loaded high WANG Chao @ 2014-04-21 17:56 ` Yinghai Lu 2014-04-21 17:57 ` H. Peter Anvin 2014-04-21 18:01 ` Kees Cook 0 siblings, 2 replies; 8+ messages in thread From: Yinghai Lu @ 2014-04-21 17:56 UTC (permalink / raw) To: WANG Chao Cc: Kees Cook, H. Peter Anvin, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List On Mon, Apr 21, 2014 at 3:52 AM, WANG Chao <chaowang@redhat.com> wrote: > Hi, Kees > > When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded > high, it doesn't boot. > > I reserved 128M memory at high with kernel cmdline > "crashkernel=128M,high crashkernel=0,low", and for which I got: > > [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) > > Then I load kdump kernel into the reserved memory region, using a local > modified kexec-tools which is passing e820 in boot_params. > > The e820 map of system RAM passed to 2nd kernel: > > E820 memmap (of RAM): > 0000000000001000-000000000009e3ff (1) > 00000001af000000-00000001b6f5dfff (1) > 00000001b6fff400-00000001b6ffffff (1) > > In which, 2nd kernel is loaded at 0x1b5000000. > > After triggerred a system crash, 2nd kernel doesn't boot even with > "nokaslr" cmdline: > > # echo c > /proc/sysrq-trigger > [..] > > I'm in purgatory > early console in decompress_kernel > KASLR disabled... > > Decompressing Linux... Parsing ELF... Performing relocations... > > 32-bit relocation outside of kernel! Interesting, when kernel get at "early console in decompress_kernel" kernel already in 64 bit... what does it mean "32-bit relocation outside of kernel" ? why 32-bit is involved ? Yinghai ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-21 17:56 ` Yinghai Lu @ 2014-04-21 17:57 ` H. Peter Anvin 2014-04-21 18:01 ` Kees Cook 1 sibling, 0 replies; 8+ messages in thread From: H. Peter Anvin @ 2014-04-21 17:57 UTC (permalink / raw) To: Yinghai Lu, WANG Chao Cc: Kees Cook, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List On 04/21/2014 10:56 AM, Yinghai Lu wrote: >> >> 32-bit relocation outside of kernel! > > Interesting, when kernel get at "early console in decompress_kernel" > kernel already in 64 bit... > > what does it mean "32-bit relocation outside of kernel" ? > > why 32-bit is involved ? > Most addresses and immediates on 64 bits are 32 bits wide, which is why we have the high kernel mapping in the first place. -hpa ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-21 17:56 ` Yinghai Lu 2014-04-21 17:57 ` H. Peter Anvin @ 2014-04-21 18:01 ` Kees Cook 2014-04-22 3:16 ` WANG Chao 1 sibling, 1 reply; 8+ messages in thread From: Kees Cook @ 2014-04-21 18:01 UTC (permalink / raw) To: Yinghai Lu Cc: WANG Chao, H. Peter Anvin, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List On Mon, Apr 21, 2014 at 10:56 AM, Yinghai Lu <yinghai@kernel.org> wrote: > On Mon, Apr 21, 2014 at 3:52 AM, WANG Chao <chaowang@redhat.com> wrote: >> Hi, Kees >> >> When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded >> high, it doesn't boot. >> >> I reserved 128M memory at high with kernel cmdline >> "crashkernel=128M,high crashkernel=0,low", and for which I got: >> >> [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) >> >> Then I load kdump kernel into the reserved memory region, using a local >> modified kexec-tools which is passing e820 in boot_params. >> >> The e820 map of system RAM passed to 2nd kernel: >> >> E820 memmap (of RAM): >> 0000000000001000-000000000009e3ff (1) >> 00000001af000000-00000001b6f5dfff (1) >> 00000001b6fff400-00000001b6ffffff (1) >> >> In which, 2nd kernel is loaded at 0x1b5000000. >> >> After triggerred a system crash, 2nd kernel doesn't boot even with >> "nokaslr" cmdline: >> >> # echo c > /proc/sysrq-trigger >> [..] >> >> I'm in purgatory >> early console in decompress_kernel >> KASLR disabled... >> >> Decompressing Linux... Parsing ELF... Performing relocations... >> >> 32-bit relocation outside of kernel! > > Interesting, when kernel get at "early console in decompress_kernel" > kernel already in 64 bit... > > what does it mean "32-bit relocation outside of kernel" ? > > why 32-bit is involved ? The 64-bit kernel has both 64 and 32 bit relocations (there are two tables at the end of the kernel image). The error means that the resulting relocation is believed to be outside the kernel image: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x86/boot/compressed/misc.c#n283 Which means there is likely something wrong with this calculation in your situation: /* * Calculate the delta between where vmlinux was linked to load * and where it was actually loaded. */ delta = min_addr - LOAD_PHYSICAL_ADDR; -Kees -- Kees Cook Chrome OS Security ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-21 18:01 ` Kees Cook @ 2014-04-22 3:16 ` WANG Chao 2014-04-22 4:58 ` Yinghai Lu 0 siblings, 1 reply; 8+ messages in thread From: WANG Chao @ 2014-04-22 3:16 UTC (permalink / raw) To: Kees Cook Cc: Yinghai Lu, H. Peter Anvin, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List On 04/21/14 at 11:01am, Kees Cook wrote: > On Mon, Apr 21, 2014 at 10:56 AM, Yinghai Lu <yinghai@kernel.org> wrote: > > On Mon, Apr 21, 2014 at 3:52 AM, WANG Chao <chaowang@redhat.com> wrote: > >> Hi, Kees > >> > >> When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded > >> high, it doesn't boot. > >> > >> I reserved 128M memory at high with kernel cmdline > >> "crashkernel=128M,high crashkernel=0,low", and for which I got: > >> > >> [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) > >> > >> Then I load kdump kernel into the reserved memory region, using a local > >> modified kexec-tools which is passing e820 in boot_params. > >> > >> The e820 map of system RAM passed to 2nd kernel: > >> > >> E820 memmap (of RAM): > >> 0000000000001000-000000000009e3ff (1) > >> 00000001af000000-00000001b6f5dfff (1) > >> 00000001b6fff400-00000001b6ffffff (1) > >> > >> In which, 2nd kernel is loaded at 0x1b5000000. > >> > >> After triggerred a system crash, 2nd kernel doesn't boot even with > >> "nokaslr" cmdline: > >> > >> # echo c > /proc/sysrq-trigger > >> [..] > >> > >> I'm in purgatory > >> early console in decompress_kernel > >> KASLR disabled... > >> > >> Decompressing Linux... Parsing ELF... Performing relocations... > >> > >> 32-bit relocation outside of kernel! > > > > Interesting, when kernel get at "early console in decompress_kernel" > > kernel already in 64 bit... > > > > what does it mean "32-bit relocation outside of kernel" ? > > > > why 32-bit is involved ? > > The 64-bit kernel has both 64 and 32 bit relocations (there are two > tables at the end of the kernel image). The error means that the > resulting relocation is believed to be outside the kernel image: > > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x86/boot/compressed/misc.c#n283 > > Which means there is likely something wrong with this calculation in > your situation: > > /* > * Calculate the delta between where vmlinux was linked to load > * and where it was actually loaded. > */ > delta = min_addr - LOAD_PHYSICAL_ADDR; > Probably. I'm wondering why such relocation is still needed when kaslr is disabled in 64bit path. I think the relocation work is already handled in head_64.S. FWIW, I got these following relocation info: # arch/x86/tools/relocs --text vmlinux .section ".data.reloc","a" .balign 4 .long 0x00000000 .long 0x81004687 [..] .long 0x81e6b018 .long 0x00000000 .long 0x8100000a [..] .long 0x81e6c9fc Thanks WANG Chao ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-22 3:16 ` WANG Chao @ 2014-04-22 4:58 ` Yinghai Lu 2014-04-22 5:28 ` WANG Chao 0 siblings, 1 reply; 8+ messages in thread From: Yinghai Lu @ 2014-04-22 4:58 UTC (permalink / raw) To: WANG Chao Cc: Kees Cook, H. Peter Anvin, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 2437 bytes --] On Mon, Apr 21, 2014 at 8:16 PM, WANG Chao <chaowang@redhat.com> wrote: > On 04/21/14 at 11:01am, Kees Cook wrote: >> On Mon, Apr 21, 2014 at 10:56 AM, Yinghai Lu <yinghai@kernel.org> wrote: >> > On Mon, Apr 21, 2014 at 3:52 AM, WANG Chao <chaowang@redhat.com> wrote: >> >> Hi, Kees >> >> >> >> When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded >> >> high, it doesn't boot. >> >> >> >> I reserved 128M memory at high with kernel cmdline >> >> "crashkernel=128M,high crashkernel=0,low", and for which I got: >> >> >> >> [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) >> >> >> >> Then I load kdump kernel into the reserved memory region, using a local >> >> modified kexec-tools which is passing e820 in boot_params. >> >> >> >> The e820 map of system RAM passed to 2nd kernel: >> >> >> >> E820 memmap (of RAM): >> >> 0000000000001000-000000000009e3ff (1) >> >> 00000001af000000-00000001b6f5dfff (1) >> >> 00000001b6fff400-00000001b6ffffff (1) >> >> >> >> In which, 2nd kernel is loaded at 0x1b5000000. >> >> >> >> After triggerred a system crash, 2nd kernel doesn't boot even with >> >> "nokaslr" cmdline: >> >> >> >> # echo c > /proc/sysrq-trigger >> >> [..] >> >> >> >> I'm in purgatory >> >> early console in decompress_kernel >> >> KASLR disabled... >> >> >> >> Decompressing Linux... Parsing ELF... Performing relocations... >> >> >> >> 32-bit relocation outside of kernel! >> > >> > Interesting, when kernel get at "early console in decompress_kernel" >> > kernel already in 64 bit... >> > >> > what does it mean "32-bit relocation outside of kernel" ? >> > >> > why 32-bit is involved ? >> >> The 64-bit kernel has both 64 and 32 bit relocations (there are two >> tables at the end of the kernel image). The error means that the >> resulting relocation is believed to be outside the kernel image: >> >> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x86/boot/compressed/misc.c#n283 >> >> Which means there is likely something wrong with this calculation in >> your situation: >> >> /* >> * Calculate the delta between where vmlinux was linked to load >> * and where it was actually loaded. >> */ >> delta = min_addr - LOAD_PHYSICAL_ADDR; >> > > Probably. Please check attached that patch that will solve nokaslr. Somehow I got "KASLR could not find suitable E820 region..." so i only have "No relocation needed" will check that later. [-- Attachment #2: aslr_1.patch --] [-- Type: text/x-patch, Size: 1854 bytes --] --- arch/x86/boot/compressed/misc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) Index: linux-2.6/arch/x86/boot/compressed/misc.c =================================================================== --- linux-2.6.orig/arch/x86/boot/compressed/misc.c +++ linux-2.6/arch/x86/boot/compressed/misc.c @@ -235,8 +235,9 @@ static void error(char *x) asm("hlt"); } -#if CONFIG_X86_NEED_RELOCS -static void handle_relocations(void *output, unsigned long output_len) +#ifdef CONFIG_X86_NEED_RELOCS +static void handle_relocations(void *output_orig, void *output, + unsigned long output_len) { int *reloc; unsigned long delta, map, ptr; @@ -247,7 +248,7 @@ static void handle_relocations(void *out * Calculate the delta between where vmlinux was linked to load * and where it was actually loaded. */ - delta = min_addr - LOAD_PHYSICAL_ADDR; + delta = min_addr - (unsigned long)output_orig; if (!delta) { debug_putstr("No relocation needed... "); return; @@ -304,7 +305,8 @@ static void handle_relocations(void *out #endif } #else -static inline void handle_relocations(void *output, unsigned long output_len) +static inline void handle_relocations(void *output_orig, void *output, + unsigned long output_len) { } #endif @@ -365,6 +367,8 @@ asmlinkage void *decompress_kernel(void unsigned char *output, unsigned long output_len) { + unsigned char *output_orig = output; + real_mode = rmode; sanitize_boot_params(real_mode); @@ -417,7 +421,7 @@ asmlinkage void *decompress_kernel(void debug_putstr("... "); decompress(input_data, input_len, NULL, NULL, output, NULL, error); parse_elf(output); - handle_relocations(output, output_len); + handle_relocations(output_orig, output, output_len); debug_putstr("done.\nBooting the kernel.\n"); return output; } ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-22 4:58 ` Yinghai Lu @ 2014-04-22 5:28 ` WANG Chao 2014-04-22 18:14 ` Kees Cook 0 siblings, 1 reply; 8+ messages in thread From: WANG Chao @ 2014-04-22 5:28 UTC (permalink / raw) To: Yinghai Lu Cc: Kees Cook, H. Peter Anvin, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List On 04/21/14 at 09:58pm, Yinghai Lu wrote: > On Mon, Apr 21, 2014 at 8:16 PM, WANG Chao <chaowang@redhat.com> wrote: > > On 04/21/14 at 11:01am, Kees Cook wrote: > >> On Mon, Apr 21, 2014 at 10:56 AM, Yinghai Lu <yinghai@kernel.org> wrote: > >> > On Mon, Apr 21, 2014 at 3:52 AM, WANG Chao <chaowang@redhat.com> wrote: > >> >> Hi, Kees > >> >> > >> >> When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded > >> >> high, it doesn't boot. > >> >> > >> >> I reserved 128M memory at high with kernel cmdline > >> >> "crashkernel=128M,high crashkernel=0,low", and for which I got: > >> >> > >> >> [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) > >> >> > >> >> Then I load kdump kernel into the reserved memory region, using a local > >> >> modified kexec-tools which is passing e820 in boot_params. > >> >> > >> >> The e820 map of system RAM passed to 2nd kernel: > >> >> > >> >> E820 memmap (of RAM): > >> >> 0000000000001000-000000000009e3ff (1) > >> >> 00000001af000000-00000001b6f5dfff (1) > >> >> 00000001b6fff400-00000001b6ffffff (1) > >> >> > >> >> In which, 2nd kernel is loaded at 0x1b5000000. > >> >> > >> >> After triggerred a system crash, 2nd kernel doesn't boot even with > >> >> "nokaslr" cmdline: > >> >> > >> >> # echo c > /proc/sysrq-trigger > >> >> [..] > >> >> > >> >> I'm in purgatory > >> >> early console in decompress_kernel > >> >> KASLR disabled... > >> >> > >> >> Decompressing Linux... Parsing ELF... Performing relocations... > >> >> > >> >> 32-bit relocation outside of kernel! > >> > > >> > Interesting, when kernel get at "early console in decompress_kernel" > >> > kernel already in 64 bit... > >> > > >> > what does it mean "32-bit relocation outside of kernel" ? > >> > > >> > why 32-bit is involved ? > >> > >> The 64-bit kernel has both 64 and 32 bit relocations (there are two > >> tables at the end of the kernel image). The error means that the > >> resulting relocation is believed to be outside the kernel image: > >> > >> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x86/boot/compressed/misc.c#n283 > >> > >> Which means there is likely something wrong with this calculation in > >> your situation: > >> > >> /* > >> * Calculate the delta between where vmlinux was linked to load > >> * and where it was actually loaded. > >> */ > >> delta = min_addr - LOAD_PHYSICAL_ADDR; > >> > > > > Probably. > > Please check attached that patch that will solve nokaslr. > > Somehow I got "KASLR could not find suitable E820 region..." > so i only have "No relocation needed" I think it makes sense. If output from choose_kernel_location() doesn't change (output == output_orig), we shouldn't call relocation code. There are two situations that makes output == output_orig: - "nokaslr" case - "KASLR could not find suitable E820 region" case. > > will check that later. > --- > arch/x86/boot/compressed/misc.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > Index: linux-2.6/arch/x86/boot/compressed/misc.c > =================================================================== > --- linux-2.6.orig/arch/x86/boot/compressed/misc.c > +++ linux-2.6/arch/x86/boot/compressed/misc.c > @@ -235,8 +235,9 @@ static void error(char *x) > asm("hlt"); > } > > -#if CONFIG_X86_NEED_RELOCS > -static void handle_relocations(void *output, unsigned long output_len) > +#ifdef CONFIG_X86_NEED_RELOCS > +static void handle_relocations(void *output_orig, void *output, > + unsigned long output_len) > { > int *reloc; > unsigned long delta, map, ptr; > @@ -247,7 +248,7 @@ static void handle_relocations(void *out > * Calculate the delta between where vmlinux was linked to load > * and where it was actually loaded. > */ > - delta = min_addr - LOAD_PHYSICAL_ADDR; > + delta = min_addr - (unsigned long)output_orig; > if (!delta) { > debug_putstr("No relocation needed... "); > return; > @@ -304,7 +305,8 @@ static void handle_relocations(void *out > #endif > } > #else > -static inline void handle_relocations(void *output, unsigned long output_len) > +static inline void handle_relocations(void *output_orig, void *output, > + unsigned long output_len) > { } > #endif > > @@ -365,6 +367,8 @@ asmlinkage void *decompress_kernel(void > unsigned char *output, > unsigned long output_len) > { > + unsigned char *output_orig = output; > + > real_mode = rmode; > > sanitize_boot_params(real_mode); > @@ -417,7 +421,7 @@ asmlinkage void *decompress_kernel(void > debug_putstr("... "); > decompress(input_data, input_len, NULL, NULL, output, NULL, error); > parse_elf(output); > - handle_relocations(output, output_len); > + handle_relocations(output_orig, output, output_len); > debug_putstr("done.\nBooting the kernel.\n"); > return output; > } Thanks for the patch, it works for me :) I also have a draft patch with the same idea as Yinghai. But I take a slightly different approach: diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 1768461..7f392a8 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -360,6 +360,8 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, unsigned char *output, unsigned long output_len) { + char *output_orig; + real_mode = rmode; sanitize_boot_params(real_mode); @@ -381,6 +383,7 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, free_mem_ptr = heap; /* Heap */ free_mem_end_ptr = heap + BOOT_HEAP_SIZE; + output_orig = output; output = choose_kernel_location(input_data, input_len, output, output_len); @@ -402,7 +405,10 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, debug_putstr("\nDecompressing Linux... "); decompress(input_data, input_len, NULL, NULL, output, NULL, error); parse_elf(output); - handle_relocations(output, output_len); + + if (output != output_orig) + handle_relocations(output, output_len); + debug_putstr("done.\nBooting the kernel.\n"); return output; } Thanks WANG Chao ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: kaslr relocation incompitable with kernel loaded high 2014-04-22 5:28 ` WANG Chao @ 2014-04-22 18:14 ` Kees Cook 0 siblings, 0 replies; 8+ messages in thread From: Kees Cook @ 2014-04-22 18:14 UTC (permalink / raw) To: WANG Chao Cc: Yinghai Lu, H. Peter Anvin, Zhang Yanfei, Vivek Goyal, Linux Kernel Mailing List On Mon, Apr 21, 2014 at 10:28 PM, WANG Chao <chaowang@redhat.com> wrote: > On 04/21/14 at 09:58pm, Yinghai Lu wrote: >> On Mon, Apr 21, 2014 at 8:16 PM, WANG Chao <chaowang@redhat.com> wrote: >> > On 04/21/14 at 11:01am, Kees Cook wrote: >> >> On Mon, Apr 21, 2014 at 10:56 AM, Yinghai Lu <yinghai@kernel.org> wrote: >> >> > On Mon, Apr 21, 2014 at 3:52 AM, WANG Chao <chaowang@redhat.com> wrote: >> >> >> Hi, Kees >> >> >> >> >> >> When I'm testing kaslr with kdump, I find that when 2nd kernel is loaded >> >> >> high, it doesn't boot. >> >> >> >> >> >> I reserved 128M memory at high with kernel cmdline >> >> >> "crashkernel=128M,high crashkernel=0,low", and for which I got: >> >> >> >> >> >> [ 0.000000] Reserving 128MB of memory at 6896MB for crashkernel (System RAM: 6013MB) >> >> >> >> >> >> Then I load kdump kernel into the reserved memory region, using a local >> >> >> modified kexec-tools which is passing e820 in boot_params. >> >> >> >> >> >> The e820 map of system RAM passed to 2nd kernel: >> >> >> >> >> >> E820 memmap (of RAM): >> >> >> 0000000000001000-000000000009e3ff (1) >> >> >> 00000001af000000-00000001b6f5dfff (1) >> >> >> 00000001b6fff400-00000001b6ffffff (1) >> >> >> >> >> >> In which, 2nd kernel is loaded at 0x1b5000000. >> >> >> >> >> >> After triggerred a system crash, 2nd kernel doesn't boot even with >> >> >> "nokaslr" cmdline: >> >> >> >> >> >> # echo c > /proc/sysrq-trigger >> >> >> [..] >> >> >> >> >> >> I'm in purgatory >> >> >> early console in decompress_kernel >> >> >> KASLR disabled... >> >> >> >> >> >> Decompressing Linux... Parsing ELF... Performing relocations... >> >> >> >> >> >> 32-bit relocation outside of kernel! >> >> > >> >> > Interesting, when kernel get at "early console in decompress_kernel" >> >> > kernel already in 64 bit... >> >> > >> >> > what does it mean "32-bit relocation outside of kernel" ? >> >> > >> >> > why 32-bit is involved ? >> >> >> >> The 64-bit kernel has both 64 and 32 bit relocations (there are two >> >> tables at the end of the kernel image). The error means that the >> >> resulting relocation is believed to be outside the kernel image: >> >> >> >> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x86/boot/compressed/misc.c#n283 >> >> >> >> Which means there is likely something wrong with this calculation in >> >> your situation: >> >> >> >> /* >> >> * Calculate the delta between where vmlinux was linked to load >> >> * and where it was actually loaded. >> >> */ >> >> delta = min_addr - LOAD_PHYSICAL_ADDR; >> >> >> > >> > Probably. >> >> Please check attached that patch that will solve nokaslr. >> >> Somehow I got "KASLR could not find suitable E820 region..." >> so i only have "No relocation needed" > > I think it makes sense. If output from choose_kernel_location() doesn't > change (output == output_orig), we shouldn't call relocation code. > > There are two situations that makes output == output_orig: > - "nokaslr" case > - "KASLR could not find suitable E820 region" case. > >> >> will check that later. > >> --- >> arch/x86/boot/compressed/misc.c | 14 +++++++++----- >> 1 file changed, 9 insertions(+), 5 deletions(-) >> >> Index: linux-2.6/arch/x86/boot/compressed/misc.c >> =================================================================== >> --- linux-2.6.orig/arch/x86/boot/compressed/misc.c >> +++ linux-2.6/arch/x86/boot/compressed/misc.c >> @@ -235,8 +235,9 @@ static void error(char *x) >> asm("hlt"); >> } >> >> -#if CONFIG_X86_NEED_RELOCS >> -static void handle_relocations(void *output, unsigned long output_len) >> +#ifdef CONFIG_X86_NEED_RELOCS >> +static void handle_relocations(void *output_orig, void *output, >> + unsigned long output_len) >> { >> int *reloc; >> unsigned long delta, map, ptr; >> @@ -247,7 +248,7 @@ static void handle_relocations(void *out >> * Calculate the delta between where vmlinux was linked to load >> * and where it was actually loaded. >> */ >> - delta = min_addr - LOAD_PHYSICAL_ADDR; >> + delta = min_addr - (unsigned long)output_orig; >> if (!delta) { >> debug_putstr("No relocation needed... "); >> return; >> @@ -304,7 +305,8 @@ static void handle_relocations(void *out >> #endif >> } >> #else >> -static inline void handle_relocations(void *output, unsigned long output_len) >> +static inline void handle_relocations(void *output_orig, void *output, >> + unsigned long output_len) >> { } >> #endif >> >> @@ -365,6 +367,8 @@ asmlinkage void *decompress_kernel(void >> unsigned char *output, >> unsigned long output_len) >> { >> + unsigned char *output_orig = output; >> + >> real_mode = rmode; >> >> sanitize_boot_params(real_mode); >> @@ -417,7 +421,7 @@ asmlinkage void *decompress_kernel(void >> debug_putstr("... "); >> decompress(input_data, input_len, NULL, NULL, output, NULL, error); >> parse_elf(output); >> - handle_relocations(output, output_len); >> + handle_relocations(output_orig, output, output_len); >> debug_putstr("done.\nBooting the kernel.\n"); >> return output; >> } > > Thanks for the patch, it works for me :) > > I also have a draft patch with the same idea as Yinghai. But I take a > slightly different approach: > > diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c > index 1768461..7f392a8 100644 > --- a/arch/x86/boot/compressed/misc.c > +++ b/arch/x86/boot/compressed/misc.c > @@ -360,6 +360,8 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, > unsigned char *output, > unsigned long output_len) > { > + char *output_orig; > + > real_mode = rmode; > > sanitize_boot_params(real_mode); > @@ -381,6 +383,7 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, > free_mem_ptr = heap; /* Heap */ > free_mem_end_ptr = heap + BOOT_HEAP_SIZE; > > + output_orig = output; > output = choose_kernel_location(input_data, input_len, > output, output_len); > > @@ -402,7 +405,10 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap, > debug_putstr("\nDecompressing Linux... "); > decompress(input_data, input_len, NULL, NULL, output, NULL, error); > parse_elf(output); > - handle_relocations(output, output_len); > + > + if (output != output_orig) > + handle_relocations(output, output_len); > + > debug_putstr("done.\nBooting the kernel.\n"); > return output; > } I would like to fix this in handle_relocations instead, since then it should be obvious why the math isn't working out. As for "KASLR could not find suitable E820 region", that's due to the passed e820 regions not being usable (either not big enough or above CONFIG_RANDOMIZE_BASE_MAX_OFFSET). It sounds like the math in handle_relocations is doing the wrong thing for values >2G, due to the relocations being stored as 32-bit. Perhaps detection of "output > MAX_INT" is needed to adjust things during the relocation loops? Separately, it might be interesting to improve choose_kernel_location to deal with >2G positions. Right now it avoids it due to the lack of page table identity mappings above 2G. However that limitation may be mitigated in your use-case. -Kees -- Kees Cook Chrome OS Security ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-04-22 18:15 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-21 10:52 kaslr relocation incompitable with kernel loaded high WANG Chao 2014-04-21 17:56 ` Yinghai Lu 2014-04-21 17:57 ` H. Peter Anvin 2014-04-21 18:01 ` Kees Cook 2014-04-22 3:16 ` WANG Chao 2014-04-22 4:58 ` Yinghai Lu 2014-04-22 5:28 ` WANG Chao 2014-04-22 18:14 ` Kees Cook
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).