From patchwork Fri Sep 18 19:23:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 11785857 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49EC8746 for ; Fri, 18 Sep 2020 19:23:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 11D6B2311C for ; Fri, 18 Sep 2020 19:23:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11D6B2311C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A84ED6B00B2; Fri, 18 Sep 2020 15:23:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A5EAE6B00B3; Fri, 18 Sep 2020 15:23:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EDF36B00B5; Fri, 18 Sep 2020 15:23:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0116.hostedemail.com [216.40.44.116]) by kanga.kvack.org (Postfix) with ESMTP id 5D25C6B00B3 for ; Fri, 18 Sep 2020 15:23:36 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 14801181AEF15 for ; Fri, 18 Sep 2020 19:23:36 +0000 (UTC) X-FDA: 77277156432.18.door83_360becd2712d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id DF0C110060990 for ; Fri, 18 Sep 2020 19:23:35 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,yu-cheng.yu@intel.com,,RULES_HIT:30003:30054:30056:30064,0,RBL:192.55.52.151:@intel.com:.lbl8.mailshell.net-62.18.0.100 64.95.201.95;04y8my5whecxxhbhxn9nzu9ris97jypcs6xctmw9oo9ki5dwqg4bhkp8usmw1sn.ykgtip1efnao1ru3sxr8349y3ub9hn35hxiappjocf37gqoa8fpzf7xxat4aihb.w-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:1:0,LFtime:26,LUA_SUMMARY:none X-HE-Tag: door83_360becd2712d X-Filterd-Recvd-Size: 3783 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Fri, 18 Sep 2020 19:23:35 +0000 (UTC) IronPort-SDR: deSV2r3iYl9saOR/XCwqCnG56JiGOsQ4TL3rCoOTi/8MFvUdHfdqjthiok2fRyaOssM+QJAHQX caeN+G6J4kDw== X-IronPort-AV: E=McAfee;i="6000,8403,9748"; a="140018658" X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="140018658" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 12:23:32 -0700 IronPort-SDR: Nho7nHA5b5XpzAcHxNEw5h09TPc6KRo+anc12hycz+GZPgKxhymLdoeYO7wmK796bYz31fYQd8 QCN2mRkHYjLg== X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="484332829" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 12:23:32 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , Weijiang Yang Cc: Yu-cheng Yu Subject: [PATCH v12 8/8] x86: Disallow vsyscall emulation when CET is enabled Date: Fri, 18 Sep 2020 12:23:12 -0700 Message-Id: <20200918192312.25978-9-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200918192312.25978-1-yu-cheng.yu@intel.com> References: <20200918192312.25978-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Emulation of the legacy vsyscall page is required by some programs built before 2013. Newer programs after 2013 don't use it. Disable vsyscall emulation when Control-flow Enforcement (CET) is enabled to enhance security. Signed-off-by: Yu-cheng Yu Signed-off-by: Yu-cheng Yu --- v12: - Disable vsyscall emulation only when it is attempted (vs. at compile time). arch/x86/entry/vsyscall/vsyscall_64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 44c33103a955..3196e963e365 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -150,6 +150,15 @@ bool emulate_vsyscall(unsigned long error_code, WARN_ON_ONCE(address != regs->ip); +#ifdef CONFIG_X86_INTEL_CET + if (current->thread.cet.shstk_size || + current->thread.cet.ibt_enabled) { + warn_bad_vsyscall(KERN_INFO, regs, + "vsyscall attempted with cet enabled"); + return false; + } +#endif + if (vsyscall_mode == NONE) { warn_bad_vsyscall(KERN_INFO, regs, "vsyscall attempted with vsyscall=none");