diff options
| author |  Ingo Molnar <mingo@elte.hu>
| 2008-02-21 13:45:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu>
| 2008-04-17 17:40:45 +0200 |
| commit | b4e0409a36f4533770a12095bde2a574a08a319e (patch) | |
| tree | b160009adc4a6fb836dcd277da668c6a174c273f /arch/x86/kernel | |
| parent | x86, pci: fix off-by-one errors in some pirq warnings (diff) | |
| download | linux-b4e0409a36f4.tar.gz linux-b4e0409a36f4.tar.bz2 linux-b4e0409a36f4.zip | |
x86: check vmlinux limits, 64-bit
these build-time and link-time checks would have prevented the
vmlinux size regression.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/head64.c | 13 | ||||
| -rw-r--r-- | arch/x86/kernel/vmlinux_64.lds.S | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index ad2440832de0..38f32e798a99 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -82,6 +82,19 @@ void __init x86_64_start_kernel(char * real_mode_data) { int i; + /* + * Build-time sanity checks on the kernel image and module + * area mappings. (these are purely build-time and produce no code) + */ + BUILD_BUG_ON(MODULES_VADDR < KERNEL_IMAGE_START); + BUILD_BUG_ON(MODULES_VADDR-KERNEL_IMAGE_START < KERNEL_IMAGE_SIZE); + BUILD_BUG_ON(MODULES_LEN + KERNEL_IMAGE_SIZE > 2*PUD_SIZE); + BUILD_BUG_ON((KERNEL_IMAGE_START & ~PMD_MASK) != 0); + BUILD_BUG_ON((MODULES_VADDR & ~PMD_MASK) != 0); + BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL)); + BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == + (__START_KERNEL & PGDIR_MASK))); + /* clear bss before set_intr_gate with early_idt_handler */ clear_bss(); diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S index fab132299735..4c369451007b 100644 --- a/arch/x86/kernel/vmlinux_64.lds.S +++ b/arch/x86/kernel/vmlinux_64.lds.S @@ -247,3 +247,9 @@ SECTIONS DWARF_DEBUG } + +/* + * Build-time check on the image size: + */ +ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), + "kernel image bigger than KERNEL_IMAGE_SIZE") |