mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-02 08:34:20 +08:00
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>
127 lines
2.4 KiB
C
127 lines
2.4 KiB
C
/*
|
|
* linux/arch/unicore32/boot/compressed/misc.c
|
|
*
|
|
* Code specific to PKUnity SoC and UniCore ISA
|
|
*
|
|
* Copyright (C) 2001-2010 GUAN Xue-tao
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <asm/unaligned.h>
|
|
#include <mach/uncompress.h>
|
|
|
|
/*
|
|
* gzip delarations
|
|
*/
|
|
unsigned char *output_data;
|
|
unsigned long output_ptr;
|
|
|
|
unsigned int free_mem_ptr;
|
|
unsigned int free_mem_end_ptr;
|
|
|
|
#define STATIC static
|
|
#define STATIC_RW_DATA /* non-static please */
|
|
|
|
/*
|
|
* arch-dependent implementations
|
|
*/
|
|
#ifndef ARCH_HAVE_DECOMP_ERROR
|
|
#define arch_decomp_error(x)
|
|
#endif
|
|
|
|
#ifndef ARCH_HAVE_DECOMP_SETUP
|
|
#define arch_decomp_setup()
|
|
#endif
|
|
|
|
#ifndef ARCH_HAVE_DECOMP_PUTS
|
|
#define arch_decomp_puts(p)
|
|
#endif
|
|
|
|
void *memcpy(void *dest, const void *src, size_t n)
|
|
{
|
|
int i = 0;
|
|
unsigned char *d = (unsigned char *)dest, *s = (unsigned char *)src;
|
|
|
|
for (i = n >> 3; i > 0; i--) {
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
}
|
|
|
|
if (n & 1 << 2) {
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
}
|
|
|
|
if (n & 1 << 1) {
|
|
*d++ = *s++;
|
|
*d++ = *s++;
|
|
}
|
|
|
|
if (n & 1)
|
|
*d++ = *s++;
|
|
|
|
return dest;
|
|
}
|
|
|
|
void error(char *x)
|
|
{
|
|
arch_decomp_puts("\n\n");
|
|
arch_decomp_puts(x);
|
|
arch_decomp_puts("\n\n -- System halted");
|
|
|
|
arch_decomp_error(x);
|
|
|
|
for (;;)
|
|
; /* Halt */
|
|
}
|
|
|
|
/* Heap size should be adjusted for different decompress method */
|
|
#ifdef CONFIG_KERNEL_GZIP
|
|
#include "../../../../lib/decompress_inflate.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
#include "../../../../lib/decompress_bunzip2.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZO
|
|
#include "../../../../lib/decompress_unlzo.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZMA
|
|
#include "../../../../lib/decompress_unlzma.c"
|
|
#endif
|
|
|
|
unsigned long decompress_kernel(unsigned long output_start,
|
|
unsigned long free_mem_ptr_p,
|
|
unsigned long free_mem_ptr_end_p)
|
|
{
|
|
unsigned char *tmp;
|
|
|
|
output_data = (unsigned char *)output_start;
|
|
free_mem_ptr = free_mem_ptr_p;
|
|
free_mem_end_ptr = free_mem_ptr_end_p;
|
|
|
|
arch_decomp_setup();
|
|
|
|
tmp = (unsigned char *) (((unsigned long)input_data_end) - 4);
|
|
output_ptr = get_unaligned_le32(tmp);
|
|
|
|
arch_decomp_puts("Uncompressing Linux...");
|
|
__decompress(input_data, input_data_end - input_data, NULL, NULL,
|
|
output_data, 0, NULL, error);
|
|
arch_decomp_puts(" done, booting the kernel.\n");
|
|
return output_ptr;
|
|
}
|