From patchwork Mon Apr 10 16:44:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9673341 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 13169600CB for ; Mon, 10 Apr 2017 16:44:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1476628174 for ; Mon, 10 Apr 2017 16:44:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08AC52823E; Mon, 10 Apr 2017 16:44:55 +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 168CF28174 for ; Mon, 10 Apr 2017 16:44:51 +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: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:In-Reply-To: References:List-Owner; bh=hctY6O28AMR8icPu5ZveiJdhAMUfSalUNO/RX9kUo1Q=; b=fDR 0c0SdI684zfBYqd4ImPeTYUs5dw16/vetdaulYaeGdl5K5E5t12bskVjMhzmNS70pz2P75ImKpFni ePt+9JnFm/pB72b2eBZKAui2AtJcfp6zxI719gLwBcu1X3e02UxxZtd5lXz75PGSf3bi/oshxfMTD Z+8SHazcBXKmGH+UDc+bJ8ethV/AumdMDQXHyAltNWNcRex5b+8iDWjbtLVsJ8qgOz9aOUQWrBK3O jve/AbAJyCKHxhyAV4TacpCloO7c02hR6x79nYZ9Ux07em+puGzcgiG9sMOLIHJFSY1Hq6xdAL+Fm 7K97++pwMEctLZNRIvLrr4hNywx1wpw==; 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 1cxcQt-00013f-HF; Mon, 10 Apr 2017 16:44:51 +0000 Received: from mail-pf0-x234.google.com ([2607:f8b0:400e:c00::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cxcQp-0000bC-Co for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2017 16:44:49 +0000 Received: by mail-pf0-x234.google.com with SMTP id i5so35912084pfc.2 for ; Mon, 10 Apr 2017 09:44:26 -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; bh=BNTSudw4NuH9y9IwTEbd/1CD5NPdwhls5T+rZvPeQM4=; b=qBFWxBU/56HisnCMmH+Zp0T8BoatQ7hvNA9k5CsDBwdxmOIMtJuspOhNCssAHLHHMZ m5HQGecosMDhkTVHusapQ4P6tEMc5s0q5fRxN82J1lF1t8ZqJyQgKI+vQaNJaG3XUAP+ SiqsmsJrWEkMejs85jCpwlYP5xNa+OcdQB+cccmzHU3ych955lb+lXVnENRSkacg8a/p LormYbClI7mLc1AleGUwKVzLwxUjEt+F25PNB3c9Jxv8212qDpqtKXR8zON84aTtd371 /+vO9NmTkj8Cfrn4Ap8Tu/hBiWKts/0aZt4Zztr8ndl8DUAUTv9kBl+ylAHycSKGwuZ+ 83FA== 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; bh=BNTSudw4NuH9y9IwTEbd/1CD5NPdwhls5T+rZvPeQM4=; b=gLH8gSoH2LrbSFXqis4G4Ll640QesUE/eB4Y0PrAQpi4M3TSdmQH3dvt9KxNmFNuu+ ahJDVOrpdA3oB/aAt9Gw7I0CtvaeBaeQULurOwFCGVHZQbIJgL2FfUf/F5D0xsB0ebzA GHbaYEStBvDe2FoHye9Fs91pXcZ6w6/xqETGavgmkjDt/KcS29EWLLdWBp7/zdOHVSOB +Ue+H0ctVONQVKfdOENycG36VZ8sRZsYbbV1v1QLE5eIc96ncta1HwLJ0246r7GyEK5X 8iFxZnS4xYZfpqUYCbqpnUF8qr++FEI8HNsk2NR/wAYUtAYNxPRbE9SV2JrPxGXwxa4t zWaA== X-Gm-Message-State: AFeK/H0M8Gc2+oIVYDkkM+Cfj9pd/C17zvKmjweTAjFF4qEB7u9ql7AbjSxdGmRcxicwKYfd X-Received: by 10.98.110.193 with SMTP id j184mr56341116pfc.228.1491842665508; Mon, 10 Apr 2017 09:44:25 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.100.206.164]) by smtp.gmail.com with ESMTPSA id n7sm25743254pfn.0.2017.04.10.09.44.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Apr 2017 09:44:24 -0700 (PDT) From: Thomas Garnier To: Martin Schwidefsky , Heiko Carstens , Arnd Bergmann , Dave Hansen , Andrew Morton , Thomas Garnier , David Howells , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , "Paul E . McKenney" , Ingo Molnar , Thomas Gleixner , 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 v7 1/4] syscalls: Restore address limit after a syscall Date: Mon, 10 Apr 2017 09:44:17 -0700 Message-Id: <20170410164420.64003-1-thgarnie@google.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170410_094447_488824_DD408D6D X-CRM114-Status: GOOD ( 17.55 ) 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 This patch ensures a syscall does not return to user-mode with a kernel address limit. If that happened, a process can corrupt kernel-mode memory and elevate privileges. For example, it would mitigation this bug: - https://bugs.chromium.org/p/project-zero/issues/detail?id=990 The CONFIG_ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE option is also added so each architecture can optimize this change. Signed-off-by: Thomas Garnier Tested-by: Kees Cook --- Based on next-20170410 --- arch/s390/Kconfig | 1 + include/linux/syscalls.h | 26 +++++++++++++++++++++++++- init/Kconfig | 6 ++++++ kernel/sys.c | 13 +++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index d25435d94b6e..489a0cc6e46b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -103,6 +103,7 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_BH select ARCH_INLINE_WRITE_UNLOCK_IRQ select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE + select ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE select ARCH_SAVE_PAGE_KEYS if HIBERNATION select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 980c3c9b06f8..801a7a74fe28 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -191,6 +191,27 @@ extern struct trace_event_functions exit_syscall_print_funcs; SYSCALL_METADATA(sname, x, __VA_ARGS__) \ __SYSCALL_DEFINEx(x, sname, __VA_ARGS__) + +/* + * Called before coming back to user-mode. Returning to user-mode with an + * address limit different than USER_DS can allow to overwrite kernel memory. + */ +static inline void verify_pre_usermode_state(void) { + BUG_ON(!segment_eq(get_fs(), USER_DS)); +} + +#ifndef CONFIG_ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE +#define __CHECK_USER_CALLER() \ + bool user_caller = segment_eq(get_fs(), USER_DS) +#define __VERIFY_PRE_USERMODE_STATE() \ + if (user_caller) verify_pre_usermode_state() +#else +#define __CHECK_USER_CALLER() +#define __VERIFY_PRE_USERMODE_STATE() +asmlinkage void address_limit_check_failed(void); +#endif + + #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__) #define __SYSCALL_DEFINEx(x, name, ...) \ asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \ @@ -199,7 +220,10 @@ extern struct trace_event_functions exit_syscall_print_funcs; asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \ { \ - long ret = SYSC##name(__MAP(x,__SC_CAST,__VA_ARGS__)); \ + long ret; \ + __CHECK_USER_CALLER(); \ + ret = SYSC##name(__MAP(x,__SC_CAST,__VA_ARGS__)); \ + __VERIFY_PRE_USERMODE_STATE(); \ __MAP(x,__SC_TEST,__VA_ARGS__); \ __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \ return ret; \ diff --git a/init/Kconfig b/init/Kconfig index 7f7027817bce..e5fbd0becfa7 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1958,6 +1958,12 @@ config PROFILING config TRACEPOINTS bool +config ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE + bool + help + Disable the generic pre-usermode state verification. Allow each + architecture to optimize how and when the verification is done. + source "arch/Kconfig" endmenu # General setup diff --git a/kernel/sys.c b/kernel/sys.c index 196c7134bee6..d30530ff8166 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2459,3 +2459,16 @@ COMPAT_SYSCALL_DEFINE1(sysinfo, struct compat_sysinfo __user *, info) return 0; } #endif /* CONFIG_COMPAT */ + +#ifdef CONFIG_ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE +/* + * This function is called when an architecture specific implementation detected + * an invalid address limit. The generic user-mode state checker will finish on + * the appropriate BUG_ON. + */ +asmlinkage void address_limit_check_failed(void) +{ + verify_pre_usermode_state(); + panic("address_limit_check_failed called with a valid user-mode state"); +} +#endif