From patchwork Tue Jun 27 15:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106447 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp2506252obb; Tue, 27 Jun 2017 08:07:44 -0700 (PDT) X-Received: by 10.99.101.135 with SMTP id z129mr5713650pgb.66.1498576064519; Tue, 27 Jun 2017 08:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498576064; cv=none; d=google.com; s=arc-20160816; b=PEuEGTztV/6DlF9WRyVX7psg9lcJnZGNV/YdGvZwUvILJToeT4/iDftnCKpg1m4jkq wrsbVQASZrm6zSLe19m5KLwy2xF8AKPHgCs7JNQDoYrYU4Bhi6UvTPGqnaNRijedU/qY c8h7M/bepk3KqwiWtJowW1v8PDOcc8Hf1DdslOOzqL9nVLIHTZF7e15x/sn9pDiO3LGE tvdsH+zGFi7OUEWdgP7/OoNkKAJ1oaaDC+Euey7mHJWUhJNkzgqv76ckuppAlFZWC+c4 EfA71Ug7jd2xse9+bZ7BluNS+BxHdloGRB3X0NU+G7vLJTo138hgPwlAw9HPiwjD8cjV pv3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=prgyWvPhntaDVyBD2BSwkpO5jI99XUbsLBIRjFhBh/U=; b=Wb7t3G91TmepfeadxYPgN+5zjMtQgLY7969W6eP3nAVvtdSZBga3cVIGJ0Kf2Nuer4 zZTwpEeMVzQ+DFE98wM+sFZK7v4R4+Sh0u4x515x5F37/CFEm9wq8ypXwUYnD0dbpqHS cvp+KxVIaTPW8TV7iU3xaHkFsqxR1U6wzFqj3dZROR9zN+nQnMeamq0LimAsNCx/F8xp /Jq3szY4poK6UXnwWBhL8gKc2SJw89tEQjBPWV8v8YuEN05cwUH+QplS9DcKURFHZcJ0 vdvjMxMhOxagZzABVDGU/vuA8/bW1akUGck9fadB5xgDdSCy9WKQ1ChjKNC+81DFXd36 ItzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h66si2030341pfk.78.2017.06.27.08.07.44; Tue, 27 Jun 2017 08:07:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752589AbdF0PHV (ORCPT + 25 others); 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 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LkhPw-1e0JGQ09US-00aXgs; Tue, 27 Jun 2017 17:00:50 +0200 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 Precedence: bulk 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(-) -- 2.9.0 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);