From patchwork Mon Apr 10 16:44:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9673357 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 1CB1B600CB for ; Mon, 10 Apr 2017 16:45:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 114B92811C for ; Mon, 10 Apr 2017 16:45:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05C0B2838E; Mon, 10 Apr 2017 16:45:42 +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=ham 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 773542811C for ; Mon, 10 Apr 2017 16:45:41 +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=XnULwKiX5jjAxfN9yiKc1UhrHnbNX79i08viDQbSkOY=; b=np+ToNEFZ5s1WG6YTWKwALwf2r hEDJFDvNGdAt/1/FEQ3B7PDtSG08UTOfC8MiN5XMmfBuVE9QiHr5lyAe5sXntIx7jcQwdouXmlW99 89WW/o4+7KkJmbbHkmODqozxHTFnLiLvAgQ1ONLzmedfvuY2OELp93Am1iYuQl6ruC8xJx06iAV03 YmzylYNchjqVjqLoeK//Oj6c1uJz4CcxXy8qzOoB0LAr0iZo90lROfgmN6nLgilOA4+5F0GFyfomX NNoHVZwfdbveeg0uo+VUHrIhM+AidUjDPubLqqvQuoQlECR3W2kUBF5gFFnHeym5BWYGRe7rWTyrh WLdC7RLA==; 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 1cxcRg-00036g-6S; Mon, 10 Apr 2017 16:45:40 +0000 Received: from mail-pg0-x22e.google.com ([2607:f8b0:400e:c05::22e]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cxcQr-0000kJ-Vy for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2017 16:44:51 +0000 Received: by mail-pg0-x22e.google.com with SMTP id g2so107233285pge.3 for ; Mon, 10 Apr 2017 09:44:29 -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=40uxhJLm70VKAINHkGDKiBAm1GDfl9ArlYUHuxuPBdY=; b=FHeGuOZKMNAAnofzg4ZZatfbQfY2Zgjm6V60OlneNUau7K3zqncopGmuYb77avSQJQ MgCuTU/Ykpp5fVOxlSiwH0ctALZEDwXOE8uBb2FFXrQgnqrTqlfQAmo7NmmZyG3ntNak Z0pxTTZQTc7V3/TSvdFbT083ejVS5IrwERsRFfMWBpIEXFXlhOQE4/97IPwLJVwFqmYL zyB4Ghsu8aPg/GNTXzaKkicY68KRlV8xRer2IvZqH6OH8E0vFVD3sY+BtPmH19bSMD6e MZxW1Q5yF0jcYoEWz3Th+ITh6Y+nX8YFHP/o6v2Axd9/n+KD6d8CHjpNTcXhcBGVfIo/ +RoA== 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=40uxhJLm70VKAINHkGDKiBAm1GDfl9ArlYUHuxuPBdY=; b=Yws+h3UPl2B606n2WJ+TEi6zAqATd7+b09cJn8gjVJeeIc6wLB+nOgZUL5WpViZb4w jATzk0PPVB6GLdXBbApwd1TdQOXeGiqB2mpzsSgSaEI3lxO3wf52WlxVTACjfcHoGDma f/ahpl0c26lgocFQLXNO4cAXYuCCV14uT6Nn3gY5YEX7fPHtjVrAWCAe3AolQk1sr26I AFjZIHKy7s6DDugNkC3YPAWM1Vco1bCP/qlrl16MozKrppSpjaaAXwfi3W9yOcwMouNQ 6SDzUNYRajhJF3Tr7Zp4L0gcakzTrhcXLG5ARf4Udl6Xv2E5k1YeiN/zRLqKRzFcfSro zTGQ== X-Gm-Message-State: AFeK/H1/gT34gk1ViRnGXfUyvC0vu3wpZUAYgTp206FDvGfpVLG6MFudD2n6qVzy1UKhHUDy X-Received: by 10.99.107.72 with SMTP id g69mr57507169pgc.149.1491842668753; Mon, 10 Apr 2017 09:44:28 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.100.206.164]) by smtp.gmail.com with ESMTPSA id n7sm25743254pfn.0.2017.04.10.09.44.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Apr 2017 09:44:28 -0700 (PDT) From: Thomas Garnier To: Martin Schwidefsky , Heiko Carstens , Arnd Bergmann , Dave Hansen , Andrew Morton , Thomas Garnier , David Howells , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , "Paul E . McKenney" , Ingo Molnar , Thomas Gleixner , Oleg Nesterov , Stephen Smalley , Pavel Tikhomirov , Ingo Molnar , "H . Peter Anvin" , Andy Lutomirski , Paolo Bonzini , Kees Cook , Rik van Riel , Josh Poimboeuf , Borislav Petkov , Brian Gerst , "Kirill A . Shutemov" , Christian Borntraeger , Russell King , Will Deacon , Catalin Marinas , Mark Rutland , James Morse Subject: [PATCH v7 4/4] arm64/syscalls: Architecture specific pre-usermode check Date: Mon, 10 Apr 2017 09:44:20 -0700 Message-Id: <20170410164420.64003-4-thgarnie@google.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog In-Reply-To: <20170410164420.64003-1-thgarnie@google.com> References: <20170410164420.64003-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170410_094450_127924_069DA705 X-CRM114-Status: GOOD ( 14.22 ) 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 Disable the generic pre-usermode check in favor of an optimized implementation. This patch adds specific checks on user-mode return path to make it faster and smaller. The address limit is checked on each syscall return path to user-mode. If it was changed, a generic handler is called to stop the kernel on an explicit check. Signed-off-by: Thomas Garnier Reviewed-by: Catalin Marinas --- Based on next-20170410 --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/entry.S | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 9b8fcab7da56..3f9e8e7d9376 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..bdd094c7837a 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -744,6 +744,8 @@ 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 + tbnz x2, #63, 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 +773,9 @@ work_pending: */ ret_to_user: disable_irq // disable interrupts + ldr x2, [tsk, #TSK_TI_ADDR_LIMIT] // check addr limit change + tbnz x2, #63, addr_limit_fail + ldr x1, [tsk, #TSK_TI_FLAGS] and x2, x1, #_TIF_WORK_MASK cbnz x2, work_pending @@ -780,6 +785,14 @@ finish_ret_to_user: ENDPROC(ret_to_user) /* + * Address limit was incorrect before returning in user-mode which could be + * used to elevate privileges. Call the generic handler to stop the kernel on + * the appropriate check. This function does not return. + */ +addr_limit_fail: + bl address_limit_check_failed + +/* * This is how we return from a fork. */ ENTRY(ret_from_fork)