2010-08-03 07:21:22 +08:00
|
|
|
#ifndef BOOT_COMPRESSED_MISC_H
|
|
|
|
#define BOOT_COMPRESSED_MISC_H
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we have to be careful, because no indirections are allowed here, and
|
|
|
|
* paravirt_ops is a kind of one. As it will only run in baremetal anyway,
|
|
|
|
* we just keep it from happening
|
|
|
|
*/
|
|
|
|
#undef CONFIG_PARAVIRT
|
2015-02-14 06:39:56 +08:00
|
|
|
#undef CONFIG_KASAN
|
2010-08-03 07:21:22 +08:00
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
#define _ASM_X86_DESC_H 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <linux/linkage.h>
|
|
|
|
#include <linux/screen_info.h>
|
|
|
|
#include <linux/elf.h>
|
|
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/page.h>
|
|
|
|
#include <asm/boot.h>
|
|
|
|
#include <asm/bootparam.h>
|
2013-01-29 17:05:24 +08:00
|
|
|
#include <asm/bootparam_utils.h>
|
2010-08-03 07:21:22 +08:00
|
|
|
|
|
|
|
#define BOOT_BOOT_H
|
2010-08-03 12:03:46 +08:00
|
|
|
#include "../ctype.h"
|
2010-08-03 07:21:22 +08:00
|
|
|
|
2013-10-11 08:18:16 +08:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
#define memptr long
|
|
|
|
#else
|
|
|
|
#define memptr unsigned
|
|
|
|
#endif
|
|
|
|
|
2010-08-03 07:21:22 +08:00
|
|
|
/* misc.c */
|
2013-10-11 08:18:16 +08:00
|
|
|
extern memptr free_mem_ptr;
|
|
|
|
extern memptr free_mem_end_ptr;
|
2010-08-03 07:21:22 +08:00
|
|
|
extern struct boot_params *real_mode; /* Pointer to real-mode data */
|
2012-07-20 09:04:39 +08:00
|
|
|
void __putstr(const char *s);
|
|
|
|
#define error_putstr(__x) __putstr(__x)
|
|
|
|
|
|
|
|
#ifdef CONFIG_X86_VERBOSE_BOOTUP
|
|
|
|
|
|
|
|
#define debug_putstr(__x) __putstr(__x)
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
static inline void debug_putstr(const char *s)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
#endif
|
2010-08-03 07:21:22 +08:00
|
|
|
|
2013-10-11 08:18:14 +08:00
|
|
|
#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE
|
2010-08-03 07:21:22 +08:00
|
|
|
/* cmdline.c */
|
|
|
|
int cmdline_find_option(const char *option, char *buffer, int bufsize);
|
|
|
|
int cmdline_find_option_bool(const char *option);
|
2013-10-11 08:18:14 +08:00
|
|
|
#endif
|
2010-08-03 07:21:22 +08:00
|
|
|
|
|
|
|
|
2013-10-11 08:18:14 +08:00
|
|
|
#if CONFIG_RANDOMIZE_BASE
|
|
|
|
/* aslr.c */
|
x86/mm/ASLR: Propagate base load address calculation
Commit:
e2b32e678513 ("x86, kaslr: randomize module base load address")
makes the base address for module to be unconditionally randomized in
case when CONFIG_RANDOMIZE_BASE is defined and "nokaslr" option isn't
present on the commandline.
This is not consistent with how choose_kernel_location() decides whether
it will randomize kernel load base.
Namely, CONFIG_HIBERNATION disables kASLR (unless "kaslr" option is
explicitly specified on kernel commandline), which makes the state space
larger than what module loader is looking at. IOW CONFIG_HIBERNATION &&
CONFIG_RANDOMIZE_BASE is a valid config option, kASLR wouldn't be applied
by default in that case, but module loader is not aware of that.
Instead of fixing the logic in module.c, this patch takes more generic
aproach. It introduces a new bootparam setup data_type SETUP_KASLR and
uses that to pass the information whether kaslr has been applied during
kernel decompression, and sets a global 'kaslr_enabled' variable
accordingly, so that any kernel code (module loading, livepatching, ...)
can make decisions based on its value.
x86 module loader is converted to make use of this flag.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>
Link: https://lkml.kernel.org/r/alpine.LNX.2.00.1502101411280.10719@pobox.suse.cz
[ Always dump correct kaslr status when panicking ]
Signed-off-by: Borislav Petkov <bp@suse.de>
2015-02-13 23:04:55 +08:00
|
|
|
unsigned char *choose_kernel_location(struct boot_params *params,
|
|
|
|
unsigned char *input,
|
2013-10-11 08:18:14 +08:00
|
|
|
unsigned long input_size,
|
|
|
|
unsigned char *output,
|
|
|
|
unsigned long output_size);
|
2013-10-11 08:18:15 +08:00
|
|
|
/* cpuflags.c */
|
|
|
|
bool has_cpuflag(int flag);
|
2012-07-20 09:04:41 +08:00
|
|
|
#else
|
2013-10-11 08:18:14 +08:00
|
|
|
static inline
|
x86/mm/ASLR: Propagate base load address calculation
Commit:
e2b32e678513 ("x86, kaslr: randomize module base load address")
makes the base address for module to be unconditionally randomized in
case when CONFIG_RANDOMIZE_BASE is defined and "nokaslr" option isn't
present on the commandline.
This is not consistent with how choose_kernel_location() decides whether
it will randomize kernel load base.
Namely, CONFIG_HIBERNATION disables kASLR (unless "kaslr" option is
explicitly specified on kernel commandline), which makes the state space
larger than what module loader is looking at. IOW CONFIG_HIBERNATION &&
CONFIG_RANDOMIZE_BASE is a valid config option, kASLR wouldn't be applied
by default in that case, but module loader is not aware of that.
Instead of fixing the logic in module.c, this patch takes more generic
aproach. It introduces a new bootparam setup data_type SETUP_KASLR and
uses that to pass the information whether kaslr has been applied during
kernel decompression, and sets a global 'kaslr_enabled' variable
accordingly, so that any kernel code (module loading, livepatching, ...)
can make decisions based on its value.
x86 module loader is converted to make use of this flag.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>
Link: https://lkml.kernel.org/r/alpine.LNX.2.00.1502101411280.10719@pobox.suse.cz
[ Always dump correct kaslr status when panicking ]
Signed-off-by: Borislav Petkov <bp@suse.de>
2015-02-13 23:04:55 +08:00
|
|
|
unsigned char *choose_kernel_location(struct boot_params *params,
|
|
|
|
unsigned char *input,
|
2013-10-11 08:18:14 +08:00
|
|
|
unsigned long input_size,
|
|
|
|
unsigned char *output,
|
|
|
|
unsigned long output_size)
|
|
|
|
{
|
|
|
|
return output;
|
|
|
|
}
|
|
|
|
#endif
|
2012-07-20 09:04:41 +08:00
|
|
|
|
2013-10-11 08:18:14 +08:00
|
|
|
#ifdef CONFIG_EARLY_PRINTK
|
2012-07-20 09:04:42 +08:00
|
|
|
/* early_serial_console.c */
|
2013-10-11 08:18:14 +08:00
|
|
|
extern int early_serial_base;
|
|
|
|
void console_init(void);
|
|
|
|
#else
|
2012-07-20 09:04:41 +08:00
|
|
|
static const int early_serial_base;
|
|
|
|
static inline void console_init(void)
|
|
|
|
{ }
|
|
|
|
#endif
|
|
|
|
|
2010-08-03 07:21:22 +08:00
|
|
|
#endif
|