From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752889AbdGHMRb (ORCPT ); Sat, 8 Jul 2017 08:17:31 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55347 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752797AbdGHMR3 (ORCPT ); Sat, 8 Jul 2017 08:17:29 -0400 Date: Sat, 8 Jul 2017 05:10:37 -0700 From: tip-bot for Thomas Garnier Message-ID: Cc: viro@zeniv.linux.org.uk, arnd@arndb.de, luto@kernel.org, keescook@chromium.org, tglx@linutronix.de, pmladek@suse.com, linux@armlinux.org.uk, dave.hansen@intel.com, luto@amacapital.net, catalin.marinas@arm.com, thgarnie@google.com, panand@redhat.com, jpoimboe@redhat.com, mbenes@suse.cz, linux-kernel@vger.kernel.org, mark.rutland@arm.com, hpa@zytor.com, mingo@kernel.org, dhowells@redhat.com, will.deacon@arm.com, oleg@redhat.com, riel@redhat.com, wad@chromium.org, cmetcalf@mellanox.com, pbonzini@redhat.com Reply-To: panand@redhat.com, jpoimboe@redhat.com, mbenes@suse.cz, linux-kernel@vger.kernel.org, mark.rutland@arm.com, hpa@zytor.com, mingo@kernel.org, dhowells@redhat.com, will.deacon@arm.com, oleg@redhat.com, riel@redhat.com, cmetcalf@mellanox.com, wad@chromium.org, pbonzini@redhat.com, viro@zeniv.linux.org.uk, arnd@arndb.de, luto@kernel.org, keescook@chromium.org, tglx@linutronix.de, pmladek@suse.com, linux@armlinux.org.uk, luto@amacapital.net, dave.hansen@intel.com, thgarnie@google.com, catalin.marinas@arm.com In-Reply-To: <20170615011203.144108-3-thgarnie@google.com> References: <20170615011203.144108-3-thgarnie@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/syscall] arm64/syscalls: Check address limit on user-mode return Git-Commit-ID: cf7de27ab35172a9240f079477cae3146a182998 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: cf7de27ab35172a9240f079477cae3146a182998 Gitweb: http://git.kernel.org/tip/cf7de27ab35172a9240f079477cae3146a182998 Author: Thomas Garnier AuthorDate: Wed, 14 Jun 2017 18:12:03 -0700 Committer: Thomas Gleixner CommitDate: Sat, 8 Jul 2017 14:05:33 +0200 arm64/syscalls: Check address limit on user-mode return Ensure the address limit is a user-mode segment before returning to user-mode. Otherwise a process can corrupt kernel-mode memory and elevate privileges [1]. The set_fs function sets the TIF_SETFS flag to force a slow path on return. In the slow path, the address limit is checked to be USER_DS if needed. [1] https://bugs.chromium.org/p/project-zero/issues/detail?id=990 Signed-off-by: Thomas Garnier Reviewed-by: Catalin Marinas Signed-off-by: Thomas Gleixner Cc: Mark Rutland Cc: kernel-hardening@lists.openwall.com Cc: Will Deacon Cc: David Howells Cc: Dave Hansen Cc: Miroslav Benes Cc: Chris Metcalf Cc: Pratyush Anand Cc: Russell King Cc: Petr Mladek Cc: Rik van Riel Cc: Kees Cook Cc: Arnd Bergmann Cc: Al Viro Cc: Andy Lutomirski Cc: Josh Poimboeuf Cc: linux-arm-kernel@lists.infradead.org Cc: Will Drewry Cc: linux-api@vger.kernel.org Cc: Oleg Nesterov Cc: Andy Lutomirski Cc: Paolo Bonzini Link: http://lkml.kernel.org/r/20170615011203.144108-3-thgarnie@google.com --- arch/arm64/include/asm/thread_info.h | 4 +++- arch/arm64/include/asm/uaccess.h | 3 +++ arch/arm64/kernel/signal.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index 46c3b93..c5ba565 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -86,6 +86,7 @@ struct thread_info { #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */ #define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */ #define TIF_UPROBE 4 /* uprobe breakpoint or singlestep */ +#define TIF_FSCHECK 5 /* Check FS is USER_DS on return */ #define TIF_NOHZ 7 #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 @@ -107,11 +108,12 @@ struct thread_info { #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_UPROBE (1 << TIF_UPROBE) +#define _TIF_FSCHECK (1 << TIF_FSCHECK) #define _TIF_32BIT (1 << TIF_32BIT) #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \ - _TIF_UPROBE) + _TIF_UPROBE | _TIF_FSCHECK) #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \ diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 7b8a047..ced7a7c 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -45,6 +45,9 @@ static inline void set_fs(mm_segment_t fs) { current_thread_info()->addr_limit = fs; + /* On user-mode return, check fs is correct */ + set_thread_flag(TIF_FSCHECK); + /* * Enable/disable UAO so that copy_to_user() etc can access * kernel memory with the unprivileged instructions. diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index c7b6de6..0f02791 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -408,6 +409,10 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, * Update the trace code with the current status. */ trace_hardirqs_off(); + + /* Check valid user FS if needed */ + addr_limit_user_check(); + do { if (thread_flags & _TIF_NEED_RESCHED) { schedule();