From patchwork Tue Apr 4 17:47:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9662289 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 9E96C6032D for ; Tue, 4 Apr 2017 17:48:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91E9F283A6 for ; Tue, 4 Apr 2017 17:48:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8683428520; Tue, 4 Apr 2017 17:48:44 +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 0FF01283A6 for ; Tue, 4 Apr 2017 17:48:44 +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=OfZMF0NBmBMHjeWnPkOKP+9iN8P+ERY0H2Yk0gAkYQQ=; b=SpWtH3/twLtxnr8WwUe0tRP0xt 7RRC3nUrpGozlfFIw3LDNQTjbtnsm49dgLKuRrvkFMUrVQq73XztAol8XC+sRf8nZ0JTaIEhkI5hA /ElZCKe7wNjwgIk33AxLTSW08QrcstyZsJgqNiZVtCC20vqbgyQex7KRTt40NRc0HOn7lzUPRG4sE u8YOCzHmji99uH7ghZMwVk19vWypCt4H5DStV3Q1NblV5azX1i2EV1T72bz7eafbQpl41J+TJX4H0 fGkgwIRh/a5jOjjdIpS91YdR2b/gAUm866BpEDuHAhZAwvdKbnHV/iTMN51kvjEs1Kt55hCCSMOsk XuA8tyEg==; 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 1cvSZK-0005Ch-At; Tue, 04 Apr 2017 17:48:38 +0000 Received: from mail-pg0-x229.google.com ([2607:f8b0:400e:c05::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvSYi-0004M0-4X for linux-arm-kernel@lists.infradead.org; Tue, 04 Apr 2017 17:48:01 +0000 Received: by mail-pg0-x229.google.com with SMTP id x125so159204944pgb.0 for ; Tue, 04 Apr 2017 10:47:39 -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=cBGY51w5bWGTCdxoYiNgEo8Hq/WUs+og/EUmvk6S5vk=; b=NUsAQo5ZKB2CPWxOXE0EBWiUPaxS4EtwA9WmsIe29Q6/Wtf91Ts3li494S8ubwITp4 4Qo9saqHIMek2zQ3LA+fYjRGN2u2qUvQSDKNH+xMrNSIHSBMSmnTdTmhfYEFEHtgDIn3 1zzWljVyvMBQUyXUpFgk5xqTssrk7lpA8RzGA4B9xQB3xEGyeSjWKbB3FU33wQYPJwXq M098Ng1sPNuhlB+CI48aK7OfpQUV9AYDiwM6hQKU3D1NPAdo3UE/D0lJrKKKn4zOclAO +1L5Aoizl5h1k94cK42+UylIW3ZcF4PsxXXqJLzx9lMSFc10MIchNX8QL8afz3aFJPJq lw2g== 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=cBGY51w5bWGTCdxoYiNgEo8Hq/WUs+og/EUmvk6S5vk=; b=pvpXy8NDRxE4G/qwb23FikjB13d000RjusMhxDglfYFGnNC2hUVszgemwl4cXL7vPY za6LawUSrGcJluHAIi1unRjRFKHvlnDbmQvhLV3w85fq3KbFigbeCTtBgR1GntuYDNZz ta0WldunCvcqumHyhnTHroKq14eHSR16EuwQqkXGwgRHwkHRYZZfGOqxQeyMTkA/LiWR khiyFNjOqR2O7rLn8tJ1h6KkA7CiaWcZQPR6yzv9eiIsTS6HqkIiG53XX3/SMexBFS3i RC3c/DHuZoLYVoOjItaU9JzcoKmTLRuDo2ZEzSm5J9XKw5g2BC4fjOlpns4SNHQw9HAR G9vg== X-Gm-Message-State: AFeK/H0O/t/OqzISnPDsc4WslaHXLpX9U4lQ+YIsaYP7VTeFYA+bSFB+kLygR/kOAArK2crM X-Received: by 10.84.202.194 with SMTP id q2mr30396760plh.108.1491328058917; Tue, 04 Apr 2017 10:47:38 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.100.206.164]) by smtp.gmail.com with ESMTPSA id m69sm32969834pfc.33.2017.04.04.10.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Apr 2017 10:47:38 -0700 (PDT) From: Thomas Garnier To: Martin Schwidefsky , Heiko Carstens , Dave Hansen , Arnd Bergmann , Thomas Gleixner , Al Viro , David Howells , Thomas Garnier , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , Andrew Morton , "Paul E . McKenney" , Ingo Molnar , 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 v6 4/4] arm64/syscalls: Specific usage of verify_pre_usermode_state Date: Tue, 4 Apr 2017 10:47:27 -0700 Message-Id: <20170404174727.35478-4-thgarnie@google.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog In-Reply-To: <20170404174727.35478-1-thgarnie@google.com> References: <20170404174727.35478-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170404_104800_212458_7EC67574 X-CRM114-Status: GOOD ( 13.01 ) 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. Signed-off-by: Thomas Garnier --- Based on next-20170404 --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/entry.S | 15 +++++++++++++++ 2 files changed, 16 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..6d598e7051c3 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,12 @@ finish_ret_to_user: kernel_exit 0 ENDPROC(ret_to_user) +addr_limit_fail: + stp x0, lr, [sp,#-16]! + bl asm_verify_pre_usermode_state + ldp x0, lr, [sp],#16 + ret lr + /* * This is how we return from a fork. */