All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Thomas Garnier <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:core/urgent] arm64/syscalls: Move address limit check in loop
Date: Sun, 17 Sep 2017 10:54:45 -0700	[thread overview]
Message-ID: <tip-a2048e34d4655c06d31400646ae495bbfeb16b27@git.kernel.org> (raw)
In-Reply-To: <1504798247-48833-5-git-send-email-keescook@chromium.org>

Commit-ID:  a2048e34d4655c06d31400646ae495bbfeb16b27
Gitweb:     http://git.kernel.org/tip/a2048e34d4655c06d31400646ae495bbfeb16b27
Author:     Thomas Garnier <thgarnie@google.com>
AuthorDate: Thu, 7 Sep 2017 08:30:47 -0700
Committer:  Thomas Gleixner <tglx@linutronix.de>
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 <leonard.crestez@nxp.com>
Signed-off-by: Thomas Garnier <thgarnie@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Pratyush Anand <panand@redhat.com>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: Will Drewry <wad@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-api@vger.kernel.org
Cc: Yonghong Song <yhs@fb.com>
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 {

      parent reply	other threads:[~2017-09-17 18:00 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-07 15:30 [PATCH 0/4] Fix check address limit on user-mode Kees Cook
2017-09-07 15:30 ` Kees Cook
2017-09-07 15:30 ` [PATCH 1/4] syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check Kees Cook
2017-09-07 15:30   ` Kees Cook
2017-09-17 17:53   ` [tip:core/urgent] " tip-bot for Thomas Garnier
2017-09-07 15:30 ` [PATCH 2/4] Revert "arm/syscalls: Check address limit on user-mode return" Kees Cook
2017-09-07 15:30   ` Kees Cook
2017-09-17 17:54   ` [tip:core/urgent] " tip-bot for Thomas Garnier
2017-09-07 15:30 ` [PATCH 3/4] arm/syscalls: Optimize address limit check Kees Cook
2017-09-07 15:30   ` Kees Cook
2017-09-17 17:54   ` [tip:core/urgent] " tip-bot for Thomas Garnier
2017-09-07 15:30 ` [PATCH 4/4] arm64/syscalls: Move address limit check in loop Kees Cook
2017-09-07 15:30   ` Kees Cook
2017-09-12 18:27   ` Will Deacon
2017-09-12 18:27     ` Will Deacon
2017-09-12 18:28     ` Kees Cook
2017-09-12 18:28       ` Kees Cook
2017-09-12 18:28       ` Kees Cook
2017-09-13  8:00       ` Ingo Molnar
2017-09-13  8:00         ` Ingo Molnar
2017-09-13  8:00         ` Ingo Molnar
2017-09-17 17:54   ` tip-bot for Thomas Garnier [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-a2048e34d4655c06d31400646ae495bbfeb16b27@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=Dave.Martin@arm.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=dave.hansen@intel.com \
    --cc=dhowells@redhat.com \
    --cc=hpa@zytor.com \
    --cc=keescook@chromium.org \
    --cc=leonard.crestez@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=luto@amacapital.net \
    --cc=mingo@kernel.org \
    --cc=panand@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=thgarnie@google.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wad@chromium.org \
    --cc=will.deacon@arm.com \
    --cc=yhs@fb.com \
    --subject='Re: [tip:core/urgent] arm64/syscalls: Move address limit check in loop' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.