The patch titled
Subject: x86: fix fortified memcpy
has been removed from the -mm tree. Its filename was
include-linux-stringh-add-the-option-of-fortified-stringh-functions-fix.patch
This patch was dropped because it was folded into include-linux-stringh-add-the-option-of-fortified-stringh-functions.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: x86: fix fortified memcpy
__memcpy3d is not available when CONFIG_FORTIFY_SOURCE is enabled,
leading to a link error on 32-bit kernels:
arch/x86/lib/memcpy_32.c: In function 'memcpy':
arch/x86/lib/memcpy_32.c:10:9: error: implicit declaration of function '__memcpy3d'; did you mean '__memcpy'? [-Werror=implicit-function-declaration]
This uses the same #ifdef around the use of the function that
now protects the definition.
Fixes: mmotm ("include/linux/string.h: add the option of fortified string.h functions")
Link: http://lkml.kernel.org/r/20170627150047.660360-1-arnd@xxxxxxxx
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Daniel Micay <danielmicay@xxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/lib/memcpy_32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/x86/lib/memcpy_32.c~include-linux-stringh-add-the-option-of-fortified-stringh-functions-fix arch/x86/lib/memcpy_32.c
--- a/arch/x86/lib/memcpy_32.c~include-linux-stringh-add-the-option-of-fortified-stringh-functions-fix
+++ a/arch/x86/lib/memcpy_32.c
@@ -6,7 +6,7 @@
__visible void *memcpy(void *to, const void *from, size_t n)
{
-#ifdef CONFIG_X86_USE_3DNOW
+#if defined(CONFIG_X86_USE_3DNOW) && !defined(CONFIG_FORTIFY_SOURCE)
return __memcpy3d(to, from, n);
#else
return __memcpy(to, from, n);
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
include-linux-stringh-add-the-option-of-fortified-stringh-functions.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
