From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45546C433B4 for ; Wed, 28 Apr 2021 20:52:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9B3256140C for ; Wed, 28 Apr 2021 20:52:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B3256140C 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 00C9B8D0002; Wed, 28 Apr 2021 16:52:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F26506B006E; Wed, 28 Apr 2021 16:52:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D51F58D0002; Wed, 28 Apr 2021 16:52:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id B58C36B0036 for ; Wed, 28 Apr 2021 16:52:24 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A43F5181AF5C6 for ; Wed, 28 Apr 2021 20:52:16 +0000 (UTC) X-FDA: 78082973472.13.BDB4CED Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf18.hostedemail.com (Postfix) with ESMTP id ED6F82000272 for ; Wed, 28 Apr 2021 20:52:17 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id C2C4111CEC for ; Wed, 28 Apr 2021 20:52:15 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id A55EE23810 for ; Wed, 28 Apr 2021 20:52:15 +0000 (UTC) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 84879824999B for ; Wed, 28 Apr 2021 20:52:05 +0000 (UTC) X-FDA: 78082973010.25.0691E06 Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf25.hostedemail.com (Postfix) with ESMTP id 018196000131 for ; Wed, 28 Apr 2021 20:51:59 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id 9C5F611CEC for ; Wed, 28 Apr 2021 20:52:04 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id 4F5BD23810 for ; Wed, 28 Apr 2021 20:52:04 +0000 (UTC) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 277622488 for ; Wed, 28 Apr 2021 20:51:54 +0000 (UTC) X-FDA: 78082972548.23.F9A8AD0 Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf30.hostedemail.com (Postfix) with ESMTP id 9D46CE000131 for ; Wed, 28 Apr 2021 20:51:33 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id 7AF3611CEC for ; Wed, 28 Apr 2021 20:51:53 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id 589EB23810 for ; Wed, 28 Apr 2021 20:51:53 +0000 (UTC) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 3AC46180AE81D for ; Wed, 28 Apr 2021 20:51:43 +0000 (UTC) X-FDA: 78082972086.28.A81185E Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf23.hostedemail.com (Postfix) with ESMTP id 222CEA000396 for ; Wed, 28 Apr 2021 20:51:38 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id 5C45411CEC for ; Wed, 28 Apr 2021 20:51:42 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id 3A3DE23810 for ; Wed, 28 Apr 2021 20:51:42 +0000 (UTC) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B31384FE6 for ; Wed, 28 Apr 2021 20:50:40 +0000 (UTC) X-FDA: 78082969440.12.FFDD13E Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf11.hostedemail.com (Postfix) with ESMTP id 048462000273 for ; Wed, 28 Apr 2021 20:50:24 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id 0510A11CEC for ; Wed, 28 Apr 2021 20:50:40 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id DA49F23810 for ; Wed, 28 Apr 2021 20:50:39 +0000 (UTC) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 93FA7181AEF1E for ; Wed, 28 Apr 2021 20:49:35 +0000 (UTC) X-FDA: 78082966710.36.34E2BA3 Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf29.hostedemail.com (Postfix) with ESMTP id 277513D1 for ; Wed, 28 Apr 2021 20:49:31 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id E340A11CEC for ; Wed, 28 Apr 2021 20:49:34 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id BF9ED23810 for ; Wed, 28 Apr 2021 20:49:34 +0000 (UTC) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A41AF2C0D for ; Wed, 28 Apr 2021 20:49:24 +0000 (UTC) X-FDA: 78082966248.07.B00A3F0 Received: from smtprelay.test.hostedemail.com (mail.test.hostedemail.com [216.40.41.5]) by imf19.hostedemail.com (Postfix) with ESMTP id 4783890009F8 for ; Wed, 28 Apr 2021 20:48:54 +0000 (UTC) Received: from forelay.test.hostedemail.com (10.5.29.251.rfc1918.com [10.5.29.251]) by smtprelay01.test.hostedemail.com (Postfix) with ESMTP id 1B9DC11CEC for ; Wed, 28 Apr 2021 20:49:24 +0000 (UTC) Received: from forelay.prod.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by fograve01.test.hostedemail.com (Postfix) with ESMTP id EFAA423810 for ; Wed, 28 Apr 2021 20:49:23 +0000 (UTC) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CF2838249980 for ; Wed, 28 Apr 2021 20:49:13 +0000 (UTC) X-FDA: 78082965786.14.1319C74 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by imf24.hostedemail.com (Postfix) with ESMTP id 88DD2A000390 for ; Wed, 28 Apr 2021 20:49:01 +0000 (UTC) IronPort-SDR: bCa++vglfTZA6zzlswbqRiojYyO9qRdsHqVeQDwjeDo1IvxO+PQWyh+9uW/5uKau+VSxj/KrJF mhhP/TbL8OTQ== X-IronPort-AV: E=McAfee;i="6200,9189,9968"; a="258146316" X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="258146316" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 13:49:10 -0700 IronPort-SDR: vGWnJwbrgfpkN2beMuwcFAXncWISz0cuUun5JLR7YTtvYQETrR84ByQZ5LM6c2xCSLqPBh62Yf yPkIg66jONag== X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="423708019" Received: from yyu32-mobl1.amr.corp.intel.com (HELO [10.209.133.34]) ([10.209.133.34]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 13:49:09 -0700 Subject: Re: [PATCH v26 6/9] x86/vdso: Insert endbr32/endbr64 to vDSO To: Kees Cook Cc: 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 , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , Weijiang Yang , Pengfei Xu , Haitao Huang References: <20210427204720.25007-1-yu-cheng.yu@intel.com> <20210427204720.25007-7-yu-cheng.yu@intel.com> <202104281332.94A153C@keescook> From: "Yu, Yu-cheng" Message-ID: <88dc2e45-5fd4-9a1a-c493-3ff868a627f4@intel.com> Date: Wed, 28 Apr 2021 13:49:08 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <202104281332.94A153C@keescook> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf24; identity=mailfrom; envelope-from=""; helo=mga06.intel.com; client-ip=134.134.136.31 X-HE-DKIM-Result: none/none X-HE-Tag: 1619642941-899577 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf19; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619642934-778447 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf29; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619642971-952877 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619643024-524314 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf23; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619643098-114045 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf30; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619643093-34961 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf25; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619643119-444459 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: ED6F82000272 X-Stat-Signature: z49qshapn681gwg7yx8eg86hcxgqkos9 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf18; identity=mailfrom; envelope-from=""; helo=smtprelay.test.hostedemail.com; client-ip=216.40.41.5 X-HE-DKIM-Result: none/none X-HE-Tag: 1619643137-568225 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: On 4/28/2021 1:33 PM, Kees Cook wrote: > On Tue, Apr 27, 2021 at 01:47:17PM -0700, Yu-cheng Yu wrote: >> From: "H.J. Lu" >> >> When Indirect Branch Tracking (IBT) is enabled, vDSO functions may be >> called indirectly, and must have ENDBR32 or ENDBR64 as the first >> instruction. The compiler must support -fcf-protection=branch so that it >> can be used to compile vDSO. > > If you respin this, you can maybe rephrase this since CONFIG_X86_IBT > has already tested for the compiler support. > Yes, I will fix this. Thanks for reviewing! Yu-cheng >> >> Signed-off-by: H.J. Lu >> Signed-off-by: Yu-cheng Yu >> Cc: Andy Lutomirski >> Cc: Kees Cook > > Reviewed-by: Kees Cook > > -Kees > >> --- >> v24: >> - Replace CONFIG_X86_CET with CONFIG_X86_IBT to reflect splitting of shadow >> stack and ibt. >> >> arch/x86/entry/vdso/Makefile | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile >> index 05c4abc2fdfd..a773a5f03b63 100644 >> --- a/arch/x86/entry/vdso/Makefile >> +++ b/arch/x86/entry/vdso/Makefile >> @@ -93,6 +93,10 @@ endif >> >> $(vobjs): KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO) $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL) >> >> +ifdef CONFIG_X86_IBT >> +$(vobjs) $(vobjs32): KBUILD_CFLAGS += -fcf-protection=branch >> +endif >> + >> # >> # vDSO code runs in userspace and -pg doesn't help with profiling anyway. >> # >> -- >> 2.21.0 >> >