From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752579AbdF0PHV (ORCPT ); Tue, 27 Jun 2017 11:07:21 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:57007 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753187AbdF0PCO (ORCPT ); Tue, 27 Jun 2017 11:02:14 -0400 From: Arnd Bergmann To: Andrew Morton Cc: Daniel Micay , Kees Cook , Arnd Bergmann , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86: fix fortified memcpy Date: Tue, 27 Jun 2017 17:00:06 +0200 Message-Id: <20170627150047.660360-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:ET1367o2yThzKDSXar3diTighlmhKi1XApbv9j4arT/XwEpKEkh Yee1WALxmIWfY9aF92SzMwOUWdL7XH+PcXlCyZXRLOa2NoKuOlz3EitSSBu4WbwZatYyJFl l/i911hC6bQSNhcmDABcYxBOIGuMJqCK1v0ELnaGDzf7737l4RoI27Mr2GpkjmbM82QiJ2W 92MQksdWzp97xHfOI4lXg== X-UI-Out-Filterresults: notjunk:1;V01:K0:8ZFcEcYQiN8=:GghDTuyPOVKB0vx4OpO4gW Lam+nMHil8zD0iRG+/ho6qv26qjvXZYLMnNOhmetjznMsNtZxEZ/sBO8zMmLLA5fz6AJ2+5KU OsMqCVg17HrOn3hDCMmno6Dh0MSc7DP+tuw0JDkJeEpXHSXSi3qCZtXNpxaeaCYd2Mmf2cyCF mp7LFHD5ZucyhBVZ5lonmz7WFLy6sZBDsmu3cHnilLYXMurj4pZ+7Wttualgy9nejY/6846zY mGeB0LdEFvzjndk8ccc8+uB2aArNqF/Kq8yrDEOpRwxjQUsdyBZY+hV+uBzFfalE4cAC5m1Hq t5kZdYk5j/86IHe9wOjTjGp1QnlK0hYDkPHxCUf+BYzyrpCwSasYaqfxn5Pwuvgi3F+0i8Rkz u1XfMYWcSbietl9xE3h2ppvkIWwRA1i2ULRpXxHRKIggDeC6ff62gdRoAM4tCUMObnYdgApD4 p6YcQyGE2OKNSDyPtUVVIz0R+VwdYobIUftG1YjR7CS72DrvE8reOLVsEuLC68JCVTWT42lbu W17vNFXR6w2S9FvmHmJFZ6enFciaTYPQQAKTgdNtYrCPKl69mhBeC350FgoXpZMKoADKM+muo LDIEkvphydsAtKf9RxoMAUnHuWWTBvX/zPG/8fek6MDzg/72LUQPF40d+0RWGShcyB5ZRbn6p i6qIfhf4ympGrBwWyCcIEXU9F3A311AzE5giZfs1DUA4GAhxT62LisMH/RGckx8cpBQQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __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") Signed-off-by: Arnd Bergmann --- arch/x86/lib/memcpy_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/lib/memcpy_32.c b/arch/x86/lib/memcpy_32.c index cad12634d6bd..2eab7d0bfedd 100644 --- a/arch/x86/lib/memcpy_32.c +++ b/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); -- 2.9.0