From patchwork Fri Jun 30 15:34:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106717 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2486633qge; Fri, 30 Jun 2017 08:36:06 -0700 (PDT) X-Received: by 10.84.149.197 with SMTP id a5mr24821082plh.3.1498836966513; Fri, 30 Jun 2017 08:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498836966; cv=none; d=google.com; s=arc-20160816; b=Gp3wR1YPwfad/7YdeqpitAcsw/SdIvD1gE/6DJXOF99UySJxdH+1eBUqybrC1P8lCj sEQzQ93pw6FjJtdrIEuPfKYJmpPJJeV1M2mUetd39lUWECpbzIZ0LdWb72//mVbt72f9 rjFpwvePK7GfS4iSLII+VnaCprcCAJI8AVsFwLGgPaSpdKMU8zX4gMlMhnzXDK2gxBpi c6q7O/nQevyAg3TPY1WEslVFwj9lAuushXmGqA1WLueuE79EVf7vXXuyX3QkysYYbQNo fma5tyS4+pWA2FHQJZ5+BNrkWkn6kJcYjC/X1CqWpRdz8dKOEsY1Z/SE8Ne+XGQAbCkK VR7w== 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=ducrPJZWX2N6g4PAvby8LY8eJbyos8S44svN18bdtZM=; b=neyLyxEHnj8d/pv99AvesNvDACHPNNXLahOlRwseI7c6RaHw54nZ4HpX2YlcoVipNB pw9cvBtOzofBy5kMwDiHwl5txinf5eSwneOqUWJwfYWidIkCRNYUj/BIC9K7Z0848lhn g6CPMfuMIn0/nu7ORFhtKKNqjTzbJyk3WMSfoeAQRW0koupAA8rJjDL2Lb3lLW9l8r9i bxERQ0h43X7/PRVUzqbsoeSu3CuXr4Xa7pIQH1hgmWqwVE3z91cFN5CiZgH8LqpFYFf7 4oGI2GPsRsXOK0sb8h3RA6MTiBrzGOJx2UMX86xLwbH3NkfUnVeWKwnR8HEPkgBkk5wu 0s5A== 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 j62si5769152pgd.447.2017.06.30.08.36.06; Fri, 30 Jun 2017 08:36:06 -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 S1751689AbdF3PgA (ORCPT + 25 others); Fri, 30 Jun 2017 11:36:00 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:52401 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbdF3Pf7 (ORCPT ); Fri, 30 Jun 2017 11:35:59 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LfRYv-1e79FY0LpB-00p4Tx; Fri, 30 Jun 2017 17:35:05 +0200 From: Arnd Bergmann To: Kees Cook Cc: kernel-hardening@lists.openwall.com, Ard Biesheuvel , Arnd Bergmann , Russell King , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: fix randomized task_struct Date: Fri, 30 Jun 2017 17:34:43 +0200 Message-Id: <20170630153502.3327030-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:6MGNk6l+gVdzKGRqL4UGrrM91F9IcoAVPTuEjdYc35T/qRkDQrP pFPXKyyDeCli9CmEvSvYTzwgV1OAZIc6OUx5FwJUQQ129IBlUbnx7T8t/Wl4VCOISPzIyCj VFtsMFv6Y9zhYSi+q17it5ddnTdgp8VkrJTfSiao1smKFwnbv1yHDaMSUJr4TToaXoV4KGG 3kYoDPdbFOG/3csUvZe5Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:3fEc76wvi4I=:CyY/mm/oJ0B4bW4oP8Dotj t7ar79b4j+KUHoQPx7NtLfwVtDXCSm8ik0ooGn2iVEW6LgHckJ6uQIIYVmwinMipKkxVhnuKO DHaavM7wCBg7yK9wL9YACqZctXYT6GF8UV/UUbLBau/PxA8U25DnnvpBPuPp1eAkgKXyMxs5n gf76zdd/xrbdZ4Myz/w1oDbFYsdy8GwKp1iwoe58eBbEdAN+BxTruGvgm6N2HriAIxK/P5Tnx HC76Mo17yqbg303fHmzmGwyAIDdxhpuggZfAg/AcKhFyExKhZUJIjxnSsXpzdsE8CNqjRNh3/ cazkoRBNdF08p2Eeu2QfJd4qIxyaO7oJsJdOY0IvvHxYHMAQm14I9byjTsDkX7nu4dDphR901 e8Gh6vScKyKpLGyPSlDPMU0XAvc/JI/rL6jZXe5qWI7o5oOFCq9pkFhuwYUKZYVjfdrs19gZT /EUk68sxWQXNir2YQ4gmRUgrk83hu6niO+tKGh0uCD+1ysyT9bq/fS9aDwkGdts3eVfbAtzUW ZferTkLSJGT/UttYQjGl6o45M7jzcPfIBFfrfYFtGH2u1xoXjJDAx12AZXuHo08nXQ/03kG8e asJZB7LiF/ARSsJH4X4F4ERUC9fJdBkdpFYI2+FT01wjfC2sVhpSCEESXZ9UHQ/7cRuRWA2TT fMRfGbJGyIlSaMwoOF7uvSATkR81GXZUPkV+gz6h+xclG6g30U8Bhns30GY5Cy+CGiM8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the new task struct randomization, we can run into a build failure for certain random seeds: arch/arm/kernel/entry-armv.S: Assembler messages: arch/arm/kernel/entry-armv.S:803: Error: bad immediate value for offset (4096) Only two constants in asm-offset.h are affected, and I'm changing both of them here to work correctly in all configurations. One more macro has the problem, but is currently unused, so this removes it instead of adding complexity. Suggested-by: Ard Biesheuvel Fixes: c33d8b12fbbd ("task_struct: Allow randomized layout") Signed-off-by: Arnd Bergmann --- arch/arm/kernel/entry-armv.S | 5 ++++- arch/arm/mm/proc-macros.S | 10 ++++------ 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.9.0 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 9f157e7c51e7..db6d22b23bd8 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -797,7 +797,10 @@ ENTRY(__switch_to) #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) ldr r7, [r2, #TI_TASK] ldr r8, =__stack_chk_guard - ldr r7, [r7, #TSK_STACK_CANARY] + .if (TSK_STACK_CANARY > PAGE_MASK) + add r7, r7, #TSK_STACK_CANARY & PAGE_MASK + .endif + ldr r7, [r7, #TSK_STACK_CANARY & ~PAGE_MASK] #endif #ifdef CONFIG_CPU_USE_DOMAINS mcr p15, 0, r6, c3, c0, 0 @ Set domain register diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 0d40c285bd86..2c5f2a0a708b 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -25,11 +25,6 @@ ldr \rd, [\rn, #VMA_VM_FLAGS] .endm - .macro tsk_mm, rd, rn - ldr \rd, [\rn, #TI_TASK] - ldr \rd, [\rd, #TSK_ACTIVE_MM] - .endm - /* * act_mm - get current->active_mm */ @@ -37,7 +32,10 @@ bic \rd, sp, #8128 bic \rd, \rd, #63 ldr \rd, [\rd, #TI_TASK] - ldr \rd, [\rd, #TSK_ACTIVE_MM] + .if (TSK_ACTIVE_MM > PAGE_MASK) + add \rd, \rd, #TSK_ACTIVE_MM & PAGE_MASK + .endif + ldr \rd, [\rd, #TSK_ACTIVE_MM & ~PAGE_MASK] .endm /*