diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-04-09 10:08:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-04-09 10:08:51 +0100 |
| commit | 9178caf9649d97e976adbfca1f56477befde28f8 (patch) | |
| tree | 23499ef52864a885e52431839b9a4b6835deb16b /arch/arm/boot | |
| parent | b54290e51accea4f696f5dacef8e609d0ccbe54a (diff) | |
| parent | 5f8d561fb019a3ebe073c019bf5f797f5b06c55e (diff) | |
| download | lwn-9178caf9649d97e976adbfca1f56477befde28f8.tar.gz lwn-9178caf9649d97e976adbfca1f56477befde28f8.zip | |
Merge branches 'devel-stable' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/decompress.c | 5 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 7 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/misc.h | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c index a2ac3fe7dbf8..c16c1829a5e4 100644 --- a/arch/arm/boot/compressed/decompress.c +++ b/arch/arm/boot/compressed/decompress.c @@ -6,10 +6,7 @@ #include <linux/stddef.h> /* for NULL */ #include <linux/linkage.h> #include <asm/string.h> - -extern unsigned long free_mem_ptr; -extern unsigned long free_mem_end_ptr; -extern void error(char *); +#include "misc.h" #define STATIC static #define STATIC_RW_DATA /* non-static please */ diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 16a8a804e958..79f56c5a9fe5 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -22,9 +22,9 @@ unsigned int __machine_arch_type; #include <linux/compiler.h> /* for inline */ #include <linux/types.h> #include <linux/linkage.h> +#include "misc.h" static void putstr(const char *ptr); -extern void error(char *x); #include CONFIG_UNCOMPRESS_INCLUDE @@ -167,3 +167,8 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, else putstr(" done, booting the kernel.\n"); } + +void fortify_panic(const char *name) +{ + error("detected buffer overflow"); +} diff --git a/arch/arm/boot/compressed/misc.h b/arch/arm/boot/compressed/misc.h new file mode 100644 index 000000000000..c958dccd1d97 --- /dev/null +++ b/arch/arm/boot/compressed/misc.h @@ -0,0 +1,10 @@ +#ifndef MISC_H +#define MISC_H + +#include <linux/compiler.h> + +void error(char *x) __noreturn; +extern unsigned long free_mem_ptr; +extern unsigned long free_mem_end_ptr; + +#endif |