Message ID | 20170814213732.104301-4-thgarnie@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> 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 176B6602D9 for <patchwork-linux-arm@patchwork.kernel.org>; Mon, 14 Aug 2017 21:39:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09E3728722 for <patchwork-linux-arm@patchwork.kernel.org>; Mon, 14 Aug 2017 21:39:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F22AD2873A; Mon, 14 Aug 2017 21:39: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=-2.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_LOW 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 8877D28722 for <patchwork-linux-arm@patchwork.kernel.org>; Mon, 14 Aug 2017 21:39: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=FXIMN2HLWpNdYvccRct7PLAHKEfA2CU3rCa9z86xbzk=; b=K8ysj/ZhmFIaGZonpYdQJ7LSLQ LGT9yUcpCp52zjQ3qorVfCb0tk8kUivzy5VDw/39/pg6GdK8LgvyNw9xBz7WO642pAR3b55h90QPG zg2P+ljjyVWOm8B1ohUP9tSKm2uMZ/YPDpzKk0tJPVS0V9HR39NeErsXMasUykDuacE3ynHyHLBMX ojb9oosNzlMsWxyavdS7MQX98v4FX1gp3MAjDqo4rbh+f14UM3unHs3Y6ix0ZzUMvrf+P9Nw3OkKe yAEE++1XmtOKCPxVRMFQAYb2ge2+e5O/7/m/dX9FM06M8yK6DPmGNPQ3siDppXIKwWnjqfrd3Kyf7 vd9ddbrg==; 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 1dhN58-0001Gy-7d; Mon, 14 Aug 2017 21:39:30 +0000 Received: from mail-pg0-x22c.google.com ([2607:f8b0:400e:c05::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dhN48-0000Hg-8l for linux-arm-kernel@lists.infradead.org; Mon, 14 Aug 2017 21:38:30 +0000 Received: by mail-pg0-x22c.google.com with SMTP id i12so4124530pgr.3 for <linux-arm-kernel@lists.infradead.org>; Mon, 14 Aug 2017 14:38:07 -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=4jvmx+gZhslZzgRz7H9EaSvUVcChMEg5trpN0+OOsH8=; b=ORnPO6XO7hb9XI9woDr7i1YOZXY7rMaRggJk2XBubi0l7i5hwHj131II9B2ymb13Ig g+tfM7nxaPMhJ4i0r74fd/fd/2++zugiXkffGjD88Z7zEIQAbK8vNce2oIsAX0/3fua0 AQ8gJ+CaHZUIVGIr471HcMFfBBLJ40jScsyXXTuUxxgrxQLy7SUyElxn03s4poxmhV5L IBgoGau/SGjBZZboHFtKzTJ15xR9cZSFQ8chWdEK+T1WkTr4b7M4uZ5duB2y7i9sXCev 9SDJ+Wx0bEceDWlnAxAyAC6/0PXObRFV4Ucvg8zGDCCJX4NcqBXjHxqr0cjP6+etnUpr ygfA== 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=4jvmx+gZhslZzgRz7H9EaSvUVcChMEg5trpN0+OOsH8=; b=qglBJb/EDcvJL13B4+0cvMWD8IRREl5oNuO+cIqIURlEUV4H7wQbVwv20n/jgfiANj CGLbWEbsMaNiCQDq3nPIRUQxtfupJf9AwLrD1RExC30nvQ61ZtYiITf3vAZwjiZqYc9+ SyoFoayY3ZYzNKXDJ2jxj+zCyfU9uaUPIsHlOOOL4caRpZzAnPyMYQ8tbTbMi/7oRf8I RWyb3GS8VJb8zFcptqjCFxkYvLc1whbNGGn2APfY/9vqjhzkYHBNlloXenWxakmtJxpy Z7hNc4AY+kvpg6ZMYllClbAVYbrXQT+eGdbSjTdyU012Hyr9yFRoE6SmTyPfPGTzYcMv jf2g== X-Gm-Message-State: AHYfb5ge9CB1ge6JCpnO+Yq+NiK7H/XuhN6ph2jaiFX3Fv24/j8xksdr jqZNTRxlK7YcCN3M X-Received: by 10.98.7.204 with SMTP id 73mr26397548pfh.110.1502746687094; Mon, 14 Aug 2017 14:38:07 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id l2sm14619184pgc.27.2017.08.14.14.38.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Aug 2017 14:38:06 -0700 (PDT) From: Thomas Garnier <thgarnie@google.com> To: Al Viro <viro@zeniv.linux.org.uk>, Dave Hansen <dave.hansen@intel.com>, Arnd Bergmann <arnd@arndb.de>, Thomas Gleixner <tglx@linutronix.de>, Thomas Garnier <thgarnie@google.com>, Yonghong Song <yhs@fb.com>, David Howells <dhowells@redhat.com>, Russell King <linux@armlinux.org.uk>, Kees Cook <keescook@chromium.org>, Andy Lutomirski <luto@amacapital.net>, Will Drewry <wad@chromium.org>, Dave Martin <Dave.Martin@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Subject: [PATCH v3 4/4] arm64/syscalls: Move address limit check in loop Date: Mon, 14 Aug 2017 14:37:32 -0700 Message-Id: <20170814213732.104301-4-thgarnie@google.com> X-Mailer: git-send-email 2.14.1.480.gb18f417b89-goog In-Reply-To: <20170814213732.104301-1-thgarnie@google.com> References: <20170814213732.104301-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170814_143828_392868_E85BD13D X-CRM114-Status: GOOD ( 12.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-hardening@lists.openwall.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index c45214f8fb54..0bdc96c61bc0 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -751,10 +751,10 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, */ trace_hardirqs_off(); - /* Check valid user FS if needed */ - addr_limit_user_check(); - do { + /* Check valid user FS if needed */ + addr_limit_user_check(); + if (thread_flags & _TIF_NEED_RESCHED) { schedule(); } else {
A bug was reported on ARM where set_fs might be called after it was checked on the work pending function. ARM64 is not affected by this bug but has a similar construct. In order to avoid any similar problems in the future, the addr_limit_user_check function is moved at the beginning of the loop. Fixes: cf7de27ab351 ("arm64/syscalls: Check address limit on user-mode return") Reported-by: Leonard Crestez <leonard.crestez@nxp.com> Signed-off-by: Thomas Garnier <thgarnie@google.com> --- arch/arm64/kernel/signal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)