[tip:x86/boot] x86/KASLR: Use the right memcpy() implementation

From	tip-bot for Arnd Bergmann <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:x86/boot] x86/KASLR: Use the right memcpy() implementation
Date	2017-05-31 11:50 +0200
Message-ID	<tN8ql-31c-11@gated-at.bofh.it> (permalink)
References	<tMLtN-5qE-39@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  5b8b9cf76add98e19ff8ceb4247c2920687591a0
Gitweb:     http://git.kernel.org/tip/5b8b9cf76add98e19ff8ceb4247c2920687591a0
Author:     Arnd Bergmann <arnd@arndb.de>
AuthorDate: Tue, 30 May 2017 11:14:17 +0200
Committer:  Ingo Molnar <mingo@kernel.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@arndb.de>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Garnier <thgarnie@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170530091446.1000183-1-arnd@arndb.de
Signed-off-by: Ingo Molnar <mingo@kernel.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>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] x86/KASLR: use the right memcpy Arnd Bergmann <arnd@arndb.de> - 2017-05-30 11:20 +0200
  Re: [PATCH] x86/KASLR: use the right memcpy Baoquan He <bhe@redhat.com> - 2017-05-30 16:00 +0200
    Re: [PATCH] x86/KASLR: use the right memcpy Arnd Bergmann <arnd@arndb.de> - 2017-05-30 16:30 +0200
      Re: [PATCH] x86/KASLR: use the right memcpy Baoquan He <bhe@redhat.com> - 2017-05-31 03:50 +0200
  [tip:x86/boot] x86/KASLR: Use the right memcpy() implementation tip-bot for Arnd Bergmann <tipbot@zytor.com> - 2017-05-31 11:50 +0200

csiph-web