7bbaf27d9c
Calling __stack_chk_guard_setup() in decompress_kernel() is too late that stack checking always fails for decompress_kernel() itself. So remove __stack_chk_guard_setup() and initialize __stack_chk_guard before we call decompress_kernel(). Original code comes from ARM but also used for MIPS and SH, so fix them together. If without this fix, compressed booting of these archs will fail because stack checking is enabled by default (>=4.16). Link: http://lkml.kernel.org/r/1522226933-29317-1-git-send-email-chenhc@lemote.com Fixes: 8779657d29c0 ("stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG") Signed-off-by: Huacai Chen <chenhc@lemote.com> Acked-by: James Hogan <jhogan@kernel.org> Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Rich Felker <dalias@libc.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Ingo Molnar <mingo@elte.hu> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
147 lines
2.8 KiB
C
147 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* arch/sh/boot/compressed/misc.c
|
|
*
|
|
* This is a collection of several routines from gzip-1.0.3
|
|
* adapted for Linux.
|
|
*
|
|
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
|
*
|
|
* Adapted for SH by Stuart Menefy, Aug 1999
|
|
*
|
|
* Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000
|
|
*/
|
|
|
|
#include <linux/uaccess.h>
|
|
#include <asm/addrspace.h>
|
|
#include <asm/page.h>
|
|
|
|
/*
|
|
* gzip declarations
|
|
*/
|
|
|
|
#define STATIC static
|
|
|
|
#undef memset
|
|
#undef memcpy
|
|
#define memzero(s, n) memset ((s), 0, (n))
|
|
|
|
/* cache.c */
|
|
#define CACHE_ENABLE 0
|
|
#define CACHE_DISABLE 1
|
|
int cache_control(unsigned int command);
|
|
|
|
extern char input_data[];
|
|
extern int input_len;
|
|
static unsigned char *output;
|
|
|
|
static void error(char *m);
|
|
|
|
int puts(const char *);
|
|
|
|
extern int _text; /* Defined in vmlinux.lds.S */
|
|
extern int _end;
|
|
static unsigned long free_mem_ptr;
|
|
static unsigned long free_mem_end_ptr;
|
|
|
|
#ifdef CONFIG_HAVE_KERNEL_BZIP2
|
|
#define HEAP_SIZE 0x400000
|
|
#else
|
|
#define HEAP_SIZE 0x10000
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_GZIP
|
|
#include "../../../../lib/decompress_inflate.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
#include "../../../../lib/decompress_bunzip2.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZMA
|
|
#include "../../../../lib/decompress_unlzma.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_XZ
|
|
#include "../../../../lib/decompress_unxz.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZO
|
|
#include "../../../../lib/decompress_unlzo.c"
|
|
#endif
|
|
|
|
int puts(const char *s)
|
|
{
|
|
/* This should be updated to use the sh-sci routines */
|
|
return 0;
|
|
}
|
|
|
|
void* memset(void* s, int c, size_t n)
|
|
{
|
|
int i;
|
|
char *ss = (char*)s;
|
|
|
|
for (i=0;i<n;i++) ss[i] = c;
|
|
return s;
|
|
}
|
|
|
|
void* memcpy(void* __dest, __const void* __src,
|
|
size_t __n)
|
|
{
|
|
int i;
|
|
char *d = (char *)__dest, *s = (char *)__src;
|
|
|
|
for (i=0;i<__n;i++) d[i] = s[i];
|
|
return __dest;
|
|
}
|
|
|
|
static void error(char *x)
|
|
{
|
|
puts("\n\n");
|
|
puts(x);
|
|
puts("\n\n -- System halted");
|
|
|
|
while(1); /* Halt */
|
|
}
|
|
|
|
const unsigned long __stack_chk_guard = 0x000a0dff;
|
|
|
|
void __stack_chk_fail(void)
|
|
{
|
|
error("stack-protector: Kernel stack is corrupted\n");
|
|
}
|
|
|
|
#ifdef CONFIG_SUPERH64
|
|
#define stackalign 8
|
|
#else
|
|
#define stackalign 4
|
|
#endif
|
|
|
|
#define STACK_SIZE (4096)
|
|
long __attribute__ ((aligned(stackalign))) user_stack[STACK_SIZE];
|
|
long *stack_start = &user_stack[STACK_SIZE];
|
|
|
|
void decompress_kernel(void)
|
|
{
|
|
unsigned long output_addr;
|
|
|
|
#ifdef CONFIG_SUPERH64
|
|
output_addr = (CONFIG_MEMORY_START + 0x2000);
|
|
#else
|
|
output_addr = __pa((unsigned long)&_text+PAGE_SIZE);
|
|
#if defined(CONFIG_29BIT)
|
|
output_addr |= P2SEG;
|
|
#endif
|
|
#endif
|
|
|
|
output = (unsigned char *)output_addr;
|
|
free_mem_ptr = (unsigned long)&_end;
|
|
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
|
|
|
|
puts("Uncompressing Linux... ");
|
|
cache_control(CACHE_ENABLE);
|
|
__decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error);
|
|
cache_control(CACHE_DISABLE);
|
|
puts("Ok, booting the kernel.\n");
|
|
}
|