summaryrefslogtreecommitdiff
path: root/arch/x86/boot/compressed/aslr.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-11-12 16:56:07 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2013-11-12 16:58:35 (GMT)
commit327f7d72454aecdc7a4a1c847a291a3f224b730f (patch)
treee9012b05ecec74140256e62ca7d1a4388cd46198 /arch/x86/boot/compressed/aslr.c
parente8236c4d9338d52d0f2fcecc0b792ac0542e4ee9 (diff)
downloadlinux-327f7d72454aecdc7a4a1c847a291a3f224b730f.tar.xz
x86, kaslr: Use char array to gain sizeof sanity
The build_str needs to be char [] not char * for the sizeof() to report the string length. Reported-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Kees Cook <keescook@chromium.org> Link: http://lkml.kernel.org/r/20131112165607.GA5921@www.outflux.net Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/compressed/aslr.c')
-rw-r--r--arch/x86/boot/compressed/aslr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index 38a07cc..84be175 100644
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -13,7 +13,7 @@
#include <linux/version.h>
/* Simplified build-specific string for starting entropy. */
-static const char *build_str = UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+static const char build_str[] = UTS_RELEASE " (" LINUX_COMPILE_BY "@"
LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION;
#define I8254_PORT_CONTROL 0x43