aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <[email protected]>2017-05-30 11:14:17 +0200
committerIngo Molnar <[email protected]>2017-05-31 07:59:45 +0200
commit5b8b9cf76add98e19ff8ceb4247c2920687591a0 (patch)
tree03330eba950f6d1a2b714d4154945dc62794274f
parent8fcc9bc3eaa2ef8345e2b4b22e3a88804ac46337 (diff)
x86/KASLR: Use the right memcpy() implementation
The decompressor has its own implementation of the string functions, but has to include the right header to get those, while implicitly including linux/string.h may result in a link error: arch/x86/boot/compressed/kaslr.o: In function `choose_random_location': kaslr.c:(.text+0xf51): undefined reference to `_mmx_memcpy' This has appeared now as KASLR started using memcpy(), via: d52e7d5a952c ("x86/KASLR: Parse all 'memmap=' boot option entries") Other files in the decompressor already do the same thing. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Baoquan He <[email protected]> Cc: Dave Jiang <[email protected]> Cc: Kees Cook <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Garnier <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r--arch/x86/boot/compressed/kaslr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index e0eba12bffe7..fe318b44f7b8 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -30,6 +30,7 @@
#include "misc.h"
#include "error.h"
+#include "../string.h"
#include <generated/compile.h>
#include <linux/module.h>