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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 14E32C433E6 for ; Wed, 10 Mar 2021 22:06:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B72D264E27 for ; Wed, 10 Mar 2021 22:06:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B72D264E27 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 6495A8D023D; Wed, 10 Mar 2021 17:05:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 620F48D023C; Wed, 10 Mar 2021 17:05:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 49AA88D023D; Wed, 10 Mar 2021 17:05:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id 27E988D023C for ; Wed, 10 Mar 2021 17:05:50 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E46498249980 for ; Wed, 10 Mar 2021 22:05:49 +0000 (UTC) X-FDA: 77905347618.04.6A9CE67 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf27.hostedemail.com (Postfix) with ESMTP id 99CAF801914F for ; Wed, 10 Mar 2021 22:05:45 +0000 (UTC) IronPort-SDR: tMIjHW8REZmqR5S7f1yBLnxLHK8mVAW1chPIaHqoccBxegeS0eUUbv+TESwFMPthroKSk05+u+ uOWUTRJTR8nQ== X-IronPort-AV: E=McAfee;i="6000,8403,9919"; a="208385081" X-IronPort-AV: E=Sophos;i="5.81,238,1610438400"; d="scan'208";a="208385081" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 14:05:48 -0800 IronPort-SDR: cFlR7DYhml8cec/7yoTEVD0F7HdjWLAxmrclbVaOWFOAZv6V/+YgufFLOoCrP0rmMx3yKh9OPQ 09AnI40Ac1ew== X-IronPort-AV: E=Sophos;i="5.81,238,1610438400"; d="scan'208";a="410368521" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 14:05:48 -0800 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 , Pengfei Xu , Haitao Huang Cc: Yu-cheng Yu Subject: [PATCH v22 7/8] x86/vdso: Insert endbr32/endbr64 to vDSO Date: Wed, 10 Mar 2021 14:05:18 -0800 Message-Id: <20210310220519.16811-8-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210310220519.16811-1-yu-cheng.yu@intel.com> References: <20210310220519.16811-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 X-Stat-Signature: hp1ka8dbc3yu91e851zi4izg6p5npbho X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 99CAF801914F Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf27; identity=mailfrom; envelope-from=""; helo=mga01.intel.com; client-ip=192.55.52.88 X-HE-DKIM-Result: none/none X-HE-Tag: 1615413945-361299 Content-Transfer-Encoding: quoted-printable 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: 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=3Dbranch so that = it can be used to compile vDSO. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Acked-by: Andy Lutomirski Reviewed-by: Kees Cook --- 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..c9eccbc06e8c 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -93,6 +93,10 @@ endif =20 $(vobjs): KBUILD_CFLAGS :=3D $(filter-out $(CC_FLAGS_LTO) $(GCC_PLUGINS_= CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL) =20 +ifdef CONFIG_X86_CET +$(vobjs) $(vobjs32): KBUILD_CFLAGS +=3D -fcf-protection=3Dbranch +endif + # # vDSO code runs in userspace and -pg doesn't help with profiling anyway= . # --=20 2.21.0