2d3862d26e
When loading x86 64bit kernel above 4GiB with patched grub2, got kernel
gunzip error.
| early console in decompress_kernel
| decompress_kernel:
| input: [0x807f2143b4-0x807ff61aee]
| output: [0x807cc00000-0x807f3ea29b] 0x027ea29c: output_len
| boot via startup_64
| KASLR using RDTSC...
| new output: [0x46fe000000-0x470138cfff] 0x0338d000: output_run_size
| decompress: [0x46fe000000-0x47007ea29b] <=== [0x807f2143b4-0x807ff61aee]
|
| Decompressing Linux... gz...
|
| uncompression error
|
| -- System halted
the new buffer is at 0x46fe000000ULL, decompressor_gzip is using
0xffffffb901ffffff as out_len. gunzip in lib/zlib_inflate/inflate.c cap
that len to 0x01ffffff and decompress fails later.
We could hit this problem with crashkernel booting that uses kexec loading
kernel above 4GiB.
We have decompress_* support:
1. inbuf[]/outbuf[] for kernel preboot.
2. inbuf[]/flush() for initramfs
3. fill()/flush() for initrd.
This bug only affect kernel preboot path that use outbuf[].
Add __decompress and take real out_buf_len for gunzip instead of guessing
wrong buf size.
Fixes: 1431574a1c (lib/decompressors: fix "no limit" output buffer length)
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Jon Medhurst <tixy@linaro.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
120 lines
2.7 KiB
C
120 lines
2.7 KiB
C
/*
|
|
* Copyright 2001 MontaVista Software Inc.
|
|
* Author: Matt Porter <mporter@mvista.com>
|
|
*
|
|
* Copyright (C) 2009 Lemote, Inc.
|
|
* Author: Wu Zhangjin <wuzhangjin@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/addrspace.h>
|
|
|
|
/*
|
|
* These two variables specify the free mem region
|
|
* that can be used for temporary malloc area
|
|
*/
|
|
unsigned long free_mem_ptr;
|
|
unsigned long free_mem_end_ptr;
|
|
|
|
/* The linker tells us where the image is. */
|
|
extern unsigned char __image_begin, __image_end;
|
|
|
|
/* debug interfaces */
|
|
#ifdef CONFIG_DEBUG_ZBOOT
|
|
extern void puts(const char *s);
|
|
extern void puthex(unsigned long long val);
|
|
#else
|
|
#define puts(s) do {} while (0)
|
|
#define puthex(val) do {} while (0)
|
|
#endif
|
|
|
|
void error(char *x)
|
|
{
|
|
puts("\n\n");
|
|
puts(x);
|
|
puts("\n\n -- System halted");
|
|
|
|
while (1)
|
|
; /* Halt */
|
|
}
|
|
|
|
/* activate the code for pre-boot environment */
|
|
#define STATIC static
|
|
|
|
#ifdef CONFIG_KERNEL_GZIP
|
|
#include "../../../../lib/decompress_inflate.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
#include "../../../../lib/decompress_bunzip2.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZ4
|
|
#include "../../../../lib/decompress_unlz4.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZMA
|
|
#include "../../../../lib/decompress_unlzma.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZO
|
|
#include "../../../../lib/decompress_unlzo.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_XZ
|
|
#include "../../../../lib/decompress_unxz.c"
|
|
#endif
|
|
|
|
unsigned long __stack_chk_guard;
|
|
|
|
void __stack_chk_guard_setup(void)
|
|
{
|
|
__stack_chk_guard = 0x000a0dff;
|
|
}
|
|
|
|
void __stack_chk_fail(void)
|
|
{
|
|
error("stack-protector: Kernel stack is corrupted\n");
|
|
}
|
|
|
|
void decompress_kernel(unsigned long boot_heap_start)
|
|
{
|
|
unsigned long zimage_start, zimage_size;
|
|
|
|
__stack_chk_guard_setup();
|
|
|
|
zimage_start = (unsigned long)(&__image_begin);
|
|
zimage_size = (unsigned long)(&__image_end) -
|
|
(unsigned long)(&__image_begin);
|
|
|
|
puts("zimage at: ");
|
|
puthex(zimage_start);
|
|
puts(" ");
|
|
puthex(zimage_size + zimage_start);
|
|
puts("\n");
|
|
|
|
/* This area are prepared for mallocing when decompressing */
|
|
free_mem_ptr = boot_heap_start;
|
|
free_mem_end_ptr = boot_heap_start + BOOT_HEAP_SIZE;
|
|
|
|
/* Display standard Linux/MIPS boot prompt */
|
|
puts("Uncompressing Linux at load address ");
|
|
puthex(VMLINUX_LOAD_ADDRESS_ULL);
|
|
puts("\n");
|
|
|
|
/* Decompress the kernel with according algorithm */
|
|
__decompress((char *)zimage_start, zimage_size, 0, 0,
|
|
(void *)VMLINUX_LOAD_ADDRESS_ULL, 0, 0, error);
|
|
|
|
/* FIXME: should we flush cache here? */
|
|
puts("Now, booting the kernel...\n");
|
|
}
|