ARM: kernel: Detect DTB overwrite and error out
PATCH 1/1 ARM: kernel: Detect DTB overwrite and error out
Kernel can silenty fail for DT-boot after the decompression stage, if DTB is overwritten. Instead of simply failing, we detect the condition and print an error.
One may think that it is sufficient for the bootloader to place the DTB away from kernel, but this is not the right fix because: (1) We add more dependence to the bootloader's stupidity (2) the decompressed kernel end address is not known to the loader. Also, we shouldn't depend on bootloader for silently failing us, so we detect the condition and error out.
--- arch/arm/kernel/devtree.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/kernel/devtree.c +8 -0
@@ -21,6 +21,7 @@#include <asm/cputype.h> #include <asm/setup.h> +#include <asm/sections.h> #include <asm/page.h> #include <asm/smp_plat.h> #include <asm/mach/arch.h>
@@ -201,6 +202,13 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) devtree =phys_to_virt (dt_phys); +if ((char *)devtree <= _end) { +early_print ("Error: Device tree overwritten by kernel image\n" ); +early_print ("Please check your kernel config and/or bootloader\n" ); +while (true) + ; + } +/* check device tree validity */ if (be32_to_cpu (devtree->magic) !=OF_DT_HEADER )return NULL ;
Signature · 1 line
1.8.1.2
Quoted 9 lines · Joel Fernandes
Kernel can silenty fail for DT-boot after the decompression stage, if DTB is overwritten. Instead of simply failing, we detect the condition and print an error.
One may think that it is sufficient for the bootloader to place the DTB away from kernel, but this is not the right fix because: (1) We add more dependence to the bootloader's stupidity (2) the decompressed kernel end address is not known to the loader. Also, we shouldn't depend on bootloader for silently failing us, so we detect the condition and error out.
If this problem happens, is there any guarantee that the kernel will still execute far enough to actually print this error message? Can the decompressor detect this condition instead?
Quoted 5 lines · Stephen Warren
Quoted 4 lines · Joel Fernandes
Kernel can silenty fail for DT-boot after the decompression stage, if DTB is overwritten. Instead of simply failing, we detect the condition and print an error.
Quoted 8 lines
Quoted 5 lines
One may think that it is sufficient for the bootloader to place the DTB away from kernel, but this is not the right fix because: (1) We add more dependence to the bootloader's stupidity (2) the decompressed kernel end address is not known to the loader. Also, we shouldn't depend on bootloader for silently failing us, so we detect the condition and error out.
If this problem happens, is there any guarantee that the kernel will still execute far enough to actually print this error message? Can the
Yes, because till this point we don't depend on DTB yet. We're still just about to parse it. The problem detected here is the kernel overwriting the DTB, not the other way.
Quoted 1 line
decompressor detect this condition instead?
no because:
(1) AIUI, decompressor doesn't have access to vmlinux symbols like _end. decompressor code is not linked with vmlinux.
(2) The DTB pointer is physical and the _end symbol is virtual so assembly code has to do the physical to virtual translation before the cmp can be done which is more messy.
thanks,
-Joel
Quoted 12 lines · Joel Fernandes
Quoted 11 lines · Stephen Warren
Quoted 9 lines · Joel Fernandes
Kernel can silenty fail for DT-boot after the decompression stage, if DTB is overwritten. Instead of simply failing, we detect the condition and print an error.
One may think that it is sufficient for the bootloader to place the DTB away from kernel, but this is not the right fix because: (1) We add more dependence to the bootloader's stupidity (2) the decompressed kernel end address is not known to the loader. Also, we shouldn't depend on bootloader for silently failing us, so we detect the condition and error out.
Quoted 6 lines
Quoted 2 lines
If this problem happens, is there any guarantee that the kernel will still execute far enough to actually print this error message? Can the
Yes, because till this point we don't depend on DTB yet. We're still just about to parse it. The problem detected here is the kernel overwriting the DTB, not the other way.
Ah yes, that makes sense. Thanks.