From patchwork Wed Mar 22 20:38:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9640039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F39B960327 for ; Wed, 22 Mar 2017 20:46:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E410527D45 for ; Wed, 22 Mar 2017 20:46:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6ADE28461; Wed, 22 Mar 2017 20:46:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7BA1D27D45 for ; Wed, 22 Mar 2017 20:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=QFPYuS+bIQH58zryF1u98IXvQ0cY+hvrLcJwjR/l6mQ=; b=aoxaQ9CfwOPItBjrUgG80twRrP gY2aVejdJSOarFFWqXQ6/Db7CBq+596Mpe9U7hKit6o9ZPnrKVw8gH9v3brqMCHcVTSVpTQFk2zQr ie+I839Oyxn7s3Lbz6rYDUCNLB95cmLWsTphCIbLsPLVueFO5AMYpT15TxKmHHVklhgZjx24ftZUA KSUtbOv5+S4JQS4OyesszE+Q9KwWka2zNzOx+u40DDepx9r3tN6DGjCXvoRYLcr1N624Jlng5gc/l z5UTS9nRSupEnlPzkEGgyBi2yrfgDNLy0WMh7trQZyANrhcvnbHVg38o0wJsCsnga0yItmXq+NupZ eL3gatgQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqn9P-00078g-Lc; Wed, 22 Mar 2017 20:46:35 +0000 Received: from mail-pg0-x22b.google.com ([2607:f8b0:400e:c05::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqn2D-0002DH-F0 for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2017 20:39:11 +0000 Received: by mail-pg0-x22b.google.com with SMTP id w20so10101876pgc.0 for ; Wed, 22 Mar 2017 13:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xN6EWu/AguiNYM9B8s95tlpmM54FcYxpsDmFjEM13YQ=; b=ecr51TW/bZa5ccf3VPX+TZ9YvSLd7GPkxI54utIDdNTcyXq6N5gJOKKpWtVN1R2zel Qlkm58H4xhfQ5gzC+ZOAXpwQznah1zijN96SU3K8nCLpJBKcMeKtpQE/AOM6ICRKld6i xrCFaVUX6mGoYB2FA/XW5JeG4mT26RBLg0wB5zYB59qL1fvbGdT9QpVFjHX3iot41pB/ rTTjsxaZEK/pj0dlnndxbZCNtEsdFJ544dIUhrS1KBEI0+9rJPlDUNWhIVsMkIuQIvMC 46CWkftwPJsGsMfX87epi4cBOCMAxEQl1ho03zM/kd6HrA3ze9YweYJGYdiTKt67u2D5 Hk5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xN6EWu/AguiNYM9B8s95tlpmM54FcYxpsDmFjEM13YQ=; b=OWOfYCajd8C3rkLBAnapKkyqSvg5zSpNkC9GiMT1zeLAqbXopeYGRlk+JAyP557PAX nS0SMgWMLpMNAwKBPIAdbUIPZizqWgHq4K1GRZUammdezaX/Sm9r5JeUnWLhuRgGyD6v rxeBm0x0OLzOGSUiNDTTDfch4yykdHyMb+DxTiTv2zFvPoE+NHDrJk4BLqiGVL7tM4FQ 0b4JcLex3GItV76oi2GaeN1BF+WKTUO+VIhfFdL0j77m70dn06hgK20JwM/Ld5C6nWYH 0Np1J+OJba43EMpiX9liqJmTQ/5VzEgt4Opmrp31pVs1flWB1KCXrWYrj+EgRbVjoCBp UXYw== X-Gm-Message-State: AFeK/H2FbZpHLG0x0IufiVoHWcIcXXdMG2hDGKFI/sVsXPoZfmVpAM3lbqhtp6NM4w+Lo1Jy X-Received: by 10.99.8.194 with SMTP id 185mr45549562pgi.37.1490215128404; Wed, 22 Mar 2017 13:38:48 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.100.206.164]) by smtp.gmail.com with ESMTPSA id x21sm5630781pfa.71.2017.03.22.13.38.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 13:38:47 -0700 (PDT) From: Thomas Garnier To: Martin Schwidefsky , Heiko Carstens , Dave Hansen , David Howells , Al Viro , Arnd Bergmann , Thomas Garnier , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , Andrew Morton , "Paul E . McKenney" , Ingo Molnar , Thomas Gleixner , Oleg Nesterov , Pavel Tikhomirov , Stephen Smalley , Ingo Molnar , "H . Peter Anvin" , Andy Lutomirski , Paolo Bonzini , Rik van Riel , Kees Cook , Josh Poimboeuf , Borislav Petkov , Brian Gerst , "Kirill A . Shutemov" , Christian Borntraeger , Russell King , Vladimir Murzin , Will Deacon , Catalin Marinas , Mark Rutland , James Morse Subject: [PATCH v4 4/4] arm64/syscalls: Specific usage of verify_pre_usermode_state Date: Wed, 22 Mar 2017 13:38:34 -0700 Message-Id: <20170322203834.67556-4-thgarnie@google.com> X-Mailer: git-send-email 2.12.1.500.gab5fba24ee-goog In-Reply-To: <20170322203834.67556-1-thgarnie@google.com> References: <20170322203834.67556-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170322_133909_547063_D7F947D7 X-CRM114-Status: GOOD ( 12.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, kernel-hardening@lists.openwall.com, linux-api@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Implement specific usage of verify_pre_usermode_state for user-mode returns for arm64. --- Based on next-20170322 --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/entry.S | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index f2b0b528037d..0e86d87259f4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -24,6 +24,7 @@ config ARM64 select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS select ARCH_HAS_UBSAN_SANITIZE_ALL + select ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 43512d4d7df2..685b43771ac9 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -744,6 +744,10 @@ ENDPROC(cpu_switch_to) ret_fast_syscall: disable_irq // disable interrupts str x0, [sp, #S_X0] // returned x0 + ldr x2, [tsk, #TSK_TI_ADDR_LIMIT] // check addr limit change + mov x1, #TASK_SIZE_64 + cmp x2, x1 + b.ne addr_limit_fail ldr x1, [tsk, #TSK_TI_FLAGS] // re-check for syscall tracing and x2, x1, #_TIF_SYSCALL_WORK cbnz x2, ret_fast_syscall_trace @@ -771,6 +775,11 @@ work_pending: */ ret_to_user: disable_irq // disable interrupts + ldr x2, [tsk, #TSK_TI_ADDR_LIMIT] // check addr limit change + mov x1, #TASK_SIZE_64 + cmp x2, x1 + b.ne addr_limit_fail + ldr x1, [tsk, #TSK_TI_FLAGS] and x2, x1, #_TIF_WORK_MASK cbnz x2, work_pending @@ -779,6 +788,22 @@ finish_ret_to_user: kernel_exit 0 ENDPROC(ret_to_user) +addr_limit_fail: +#ifdef CONFIG_BUG_ON_DATA_CORRUPTION + stp x0, lr, [sp,#-16]! + bl verify_pre_usermode_state + ldp x0, lr, [sp],#16 +#else + /* + * Similar to set_fs(USER_DS) in verify_pre_usermode_state without a + * warning. + */ + mov x2, #TASK_SIZE_64 + str x2, [tsk, #TSK_TI_ADDR_LIMIT] + ALTERNATIVE(nop, SET_PSTATE_UAO(0), ARM64_HAS_UAO, CONFIG_ARM64_UAO) +#endif + ret lr + /* * This is how we return from a fork. */