Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp849973pxv; Thu, 22 Jul 2021 14:00:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx18QqPBA/sstvE0q1LBilMDqyH2CRTNj+SP6H42bK895xMwxxiQTLdlQLaeNN1hdhekvCE X-Received: by 2002:a92:c24c:: with SMTP id k12mr1207439ilo.28.1626987601982; Thu, 22 Jul 2021 14:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626987601; cv=none; d=google.com; s=arc-20160816; b=vqOsnNnz7ad017UIZ1e0mJvMIonx9JDJkLVNz52P+2ZedPYxE8hfT9Zk3kSjUV5hkt sOeGSt1zyOe6UFfgyQxrWup02uHU/oLbvLawGam+6zY3NRtTBW85K0DHNoV8/UrNzOU7 5HBCSeDR4KHaFgAudExTi41KUA8OO8qMavoRMUiHedLnquwMV6yUNNahbqefM1a8OiJl 6tXcmtM6HK8EVwiefY5FlcJIF6etK78Fa66I+PfpzKgUgc+wdFqjRC9MtJ6ftqURJnjE pRQ6qRMbODPArXAJWSPCO25FKf3tZpf8mHAUwThuomzAjMffKiQjoFzSjVw/NtSyw64N jrug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=tqYZ08muLN97IPRBMjMkj4hR3IT9dH31MerN/Dn1Zmw=; b=x21DHSoAFlQ55325VurBDxoPTz5sW6/tteBSAC1VsLMqWLv82pLr4VHq3DjGz1TGk4 DaLevMrNca+on2y/0f+waiKg5gIpltXIGM6F4sqFUw3l2HhdFwtlKsxRZ9XxoMRwVbF3 I30OW3JHYiZ8hxMn5dz2wVOOTJpqUvBfLC+jdvoVzVLGpxgfarEIjx8C1at6rkJBvikl mtDchhFlyPvQdNuZbj595DjG4Q4kAMB4KKlPsPNGpmPN5aQXNohhQ1FzNfrbp4dfeMm0 fa4ZJpGlnXeIgM3jzL/aJm/2VYiuVghMwXCfuWtsaL1Q3a29nRllk4AuqOd16Rl0P99x 0qWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g4si28383571jat.17.2021.07.22.13.59.50; Thu, 22 Jul 2021 14:00:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231946AbhGVURs (ORCPT + 99 others); Thu, 22 Jul 2021 16:17:48 -0400 Received: from mga07.intel.com ([134.134.136.100]:54784 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231313AbhGVURb (ORCPT ); Thu, 22 Jul 2021 16:17:31 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10053"; a="275561717" X-IronPort-AV: E=Sophos;i="5.84,262,1620716400"; d="scan'208";a="275561717" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2021 13:58:05 -0700 X-IronPort-AV: E=Sophos;i="5.84,262,1620716400"; d="scan'208";a="433273379" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2021 13:58:04 -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" , Dave Martin , Weijiang Yang , Pengfei Xu , Haitao Huang , Rick P Edgecombe Cc: Yu-cheng Yu Subject: [PATCH v28 07/10] x86/vdso: Insert endbr32/endbr64 to vDSO Date: Thu, 22 Jul 2021 13:57:20 -0700 Message-Id: <20210722205723.9476-8-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210722205723.9476-1-yu-cheng.yu@intel.com> References: <20210722205723.9476-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "H.J. Lu" When Indirect Branch Tracking (IBT) is enabled, vDSO entry points need ENDBR32/ENDBR64 as first instructions. Kconfig X86_IBT verifies compiler's -fcf-protection support. Update vDso Makefile to enable it. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook Cc: Andy Lutomirski --- 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