From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbdIQSAZ (ORCPT ); Sun, 17 Sep 2017 14:00:25 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52191 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbdIQSAX (ORCPT ); Sun, 17 Sep 2017 14:00:23 -0400 Date: Sun, 17 Sep 2017 10:54:45 -0700 From: tip-bot for Thomas Garnier Message-ID: Cc: catalin.marinas@arm.com, dhowells@redhat.com, wad@chromium.org, will.deacon@arm.com, tglx@linutronix.de, panand@redhat.com, hpa@zytor.com, dave.hansen@intel.com, linux-kernel@vger.kernel.org, leonard.crestez@nxp.com, arnd@arndb.de, keescook@chromium.org, Dave.Martin@arm.com, mingo@kernel.org, luto@amacapital.net, yhs@fb.com, thgarnie@google.com, viro@zeniv.linux.org.uk, linux@armlinux.org.uk Reply-To: dhowells@redhat.com, wad@chromium.org, catalin.marinas@arm.com, tglx@linutronix.de, panand@redhat.com, will.deacon@arm.com, keescook@chromium.org, hpa@zytor.com, dave.hansen@intel.com, leonard.crestez@nxp.com, linux-kernel@vger.kernel.org, arnd@arndb.de, viro@zeniv.linux.org.uk, linux@armlinux.org.uk, Dave.Martin@arm.com, mingo@kernel.org, luto@amacapital.net, yhs@fb.com, thgarnie@google.com In-Reply-To: <1504798247-48833-5-git-send-email-keescook@chromium.org> References: <1504798247-48833-5-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/urgent] arm64/syscalls: Move address limit check in loop Git-Commit-ID: a2048e34d4655c06d31400646ae495bbfeb16b27 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a2048e34d4655c06d31400646ae495bbfeb16b27 Gitweb: http://git.kernel.org/tip/a2048e34d4655c06d31400646ae495bbfeb16b27 Author: Thomas Garnier AuthorDate: Thu, 7 Sep 2017 08:30:47 -0700 Committer: Thomas Gleixner CommitDate: Sun, 17 Sep 2017 19:45:33 +0200 arm64/syscalls: Move address limit check in loop 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 Signed-off-by: Thomas Garnier Signed-off-by: Kees Cook Signed-off-by: Thomas Gleixner Cc: Pratyush Anand Cc: Dave Martin Cc: Will Drewry Cc: Arnd Bergmann Cc: Catalin Marinas Cc: Will Deacon Cc: Russell King Cc: Andy Lutomirski Cc: David Howells Cc: Dave Hansen Cc: Al Viro Cc: linux-api@vger.kernel.org Cc: Yonghong Song Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1504798247-48833-5-git-send-email-keescook@chromium.org --- arch/arm64/kernel/signal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index c45214f..0bdc96c 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 {