Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp4833410pxy; Tue, 27 Apr 2021 13:49:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygdcQnRsIDPulgSg0mTonjqO71XHRAxGyv8R4yzJ2nILFGZdStC2LO0ov+66GUtB0H0cFP X-Received: by 2002:aa7:87cb:0:b029:259:ef82:f55f with SMTP id i11-20020aa787cb0000b0290259ef82f55fmr24117998pfo.14.1619556557725; Tue, 27 Apr 2021 13:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619556557; cv=none; d=google.com; s=arc-20160816; b=Q1qdvOpdj+IUF05tYqjuXDS2Ip3ZdVK6I3MCyCoRMgyJS5uqdwChFb2/mv6mzj54cv gMR112ctLPeDWL8A2Wq/jQg0J+B+nC3k+IrTDjY2AGnQZbOLKYicNI7/Y7ro5vrfZaiG +vAOavIqquUmoQW+wtlrxjJoBvdFq+k1JRmAQOdtFubdpYNjD6K2WDRwFAt3BLkJz0aJ 7o7qGUwZ9I96LVw2pvJ/8IONXf8b6Oc2GUkqtg71P0pH4u7WfipM9ITvH69F0DrXTiRQ +fkwrA/UT2XJERoqivM4VRqAebvr+DeVj1dSsbNKPaC+zsBDdDsgaiUkbGVaiwCWYjUO Lmxw== 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 :ironport-sdr:ironport-sdr; bh=nb1gBpCpW5StTAEv1To47T7XyL/FBsYSstGT+qm9pU4=; b=a50BOIx1YrV6zAI5RfTk0GPg3qicD/8A9H//Y9lUS2mfXtE/ppqhx5b9kdZZRhNpuH CITQoqhXVV5H6wOQtSrwe/QU5eACHjZhTr0X6cZSZG2bHWkV999kty2Wm4BvhaZxdnig HqZah9GqWQS3EiWcN6/8vByxrUtZkUAcwMDwvlDl90EexjpZCH3AsidB/QQLI3uVE8WJ VYFQegj1Uh9u06xg6+ZsUJMiuuFiCzKEyk5dE+uk7MscqAuWa/oJaqtEFgGJbYiVVRJi M6voY6kUWKaYcbNGIb0JK5x48FDzfdbyu7L23WFD5OB5RfP06gWk/KokrQqbK10dzx/e J4Yw== 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 y9si1072837pgs.40.2021.04.27.13.49.05; Tue, 27 Apr 2021 13:49:17 -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 S239243AbhD0UtE (ORCPT + 99 others); Tue, 27 Apr 2021 16:49:04 -0400 Received: from mga09.intel.com ([134.134.136.24]:56328 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238822AbhD0Usy (ORCPT ); Tue, 27 Apr 2021 16:48:54 -0400 IronPort-SDR: bsNBoN7tvKplVHW0qolX4Y7t0C/9eAqA/nYPDlO9FDcZTXSqXk9aL2CRop6Uneu/bbcpRjqwda jhqYfeXCsbFw== X-IronPort-AV: E=McAfee;i="6200,9189,9967"; a="196699393" X-IronPort-AV: E=Sophos;i="5.82,255,1613462400"; d="scan'208";a="196699393" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2021 13:47:48 -0700 IronPort-SDR: YZTpyRz72PGCwgLwYeiqOXflRhnFSy5K/ZvH7jx+osAG/5rZX2MaO78gXUKYCIkkgLkIWRWtk1 VU4pI0QeRxMA== X-IronPort-AV: E=Sophos;i="5.82,255,1613462400"; d="scan'208";a="457835092" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2021 13:47:47 -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 , Pengfei Xu , Haitao Huang Cc: Yu-cheng Yu Subject: [PATCH v26 6/9] x86/vdso: Insert endbr32/endbr64 to vDSO Date: Tue, 27 Apr 2021 13:47:17 -0700 Message-Id: <20210427204720.25007-7-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210427204720.25007-1-yu-cheng.yu@intel.com> References: <20210427204720.25007-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 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. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Cc: Andy Lutomirski Cc: Kees Cook --- 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