[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-5b8b9cf76add98e19ff8ceb4247c2920687591a0@git.kernel.org>
Date: Wed, 31 May 2017 02:40:10 -0700
From: tip-bot for Arnd Bergmann <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, keescook@...omium.org,
tglx@...utronix.de, thgarnie@...gle.com,
torvalds@...ux-foundation.org, mingo@...nel.org, arnd@...db.de,
peterz@...radead.org, hpa@...or.com, bhe@...hat.com,
dave.jiang@...el.com
Subject: [tip:x86/boot] x86/KASLR: Use the right memcpy() implementation
Commit-ID: 5b8b9cf76add98e19ff8ceb4247c2920687591a0
Gitweb: http://git.kernel.org/tip/5b8b9cf76add98e19ff8ceb4247c2920687591a0
Author: Arnd Bergmann <arnd@...db.de>
AuthorDate: Tue, 30 May 2017 11:14:17 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 31 May 2017 07:59:45 +0200
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 <arnd@...db.de>
Acked-by: Baoquan He <bhe@...hat.com>
Cc: Dave Jiang <dave.jiang@...el.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Garnier <thgarnie@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/20170530091446.1000183-1-arnd@arndb.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/boot/compressed/kaslr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index e0eba12..fe318b4 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>
Powered by blists - more mailing lists