Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1468177pxj; Fri, 21 May 2021 15:20:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZPSm5al1zm1IQSQwnxlQ89fzaZw0frQmpjWFIpTKu285w8F/0CJEPYgGQroX2KnUoLl+f X-Received: by 2002:a17:906:3e97:: with SMTP id a23mr12446942ejj.440.1621635655943; Fri, 21 May 2021 15:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621635655; cv=none; d=google.com; s=arc-20160816; b=zau4o1VY9HO42/T7ZMXMIHlY7X+PUW4NSFmqvC0LdsHYVGaeBfRwaJC8EcOC/N7VAl LIWR6aNBJl0j+R6VdlrE9MrxxSxIl0E59Lvy1e48L0p/5nNQONFBZeIQcwNljglCNxA0 dSpfTa/lh0nsvIEvYMidyyyDzkm9/vhH009eM97k159sbIfeIoqqMM9WwDcT4VqKvvVe VsJueorA01NZJH6fo4EErU6X2eDkoa+fhA2l/zYN4tuBqY3Tp3eT1dS8ytJF5TiyqRM2 2og8mEvz4i5emfHu77TV5z5QyWdmyEPeJC/M8QtKxM+xGUWRqoko6yPklt6Vgj8kQSNh CiUw== 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=zSNOF1KfYC2N2E0SPK2DDrzBfPTW0z04wdaJJfRdgQk=; b=pYx6o6L+Ynrck2fkas8YzVCyIgct0kAlHxawchgepE7flCiOQofUmtLBc9jy3YbakX WP8/nLL3TsmWDsc1gpuUpspIiZfKvLykcuNxnOF/KIUaHZzUBFxx5CQpIA+7piPzsGlp OgZanbD2S9FpFknrZwY9M2Pq9kyPrpczZt2czDU40dQM1oJoj+wvq/n68MrpQIE987h2 9sKUOsxRL2nZIziDcKzFhypPLS4tZIt9kX9FhtVqJ4RbFU52eRb2H7SNRejhqWSUHT7X mUKEWbhF6G/51uDGugEO/cmK7LSLeyZi510LGE5zy9oBLPQhO1+UcyfYlU4j3XwOnuvt EfSQ== 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 hp23si5885915ejc.205.2021.05.21.15.20.33; Fri, 21 May 2021 15:20:55 -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 S230328AbhEUWTJ (ORCPT + 99 others); Fri, 21 May 2021 18:19:09 -0400 Received: from mga05.intel.com ([192.55.52.43]:55699 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230027AbhEUWSp (ORCPT ); Fri, 21 May 2021 18:18:45 -0400 IronPort-SDR: LrV74EYXrkHtcZInebuz5rkzoOWWSW3RWV+cXHuDotHsnzh7Hk/zXPMAvcKsggrCI2IMo2Opem o+VdSdqjp7Qw== X-IronPort-AV: E=McAfee;i="6200,9189,9991"; a="287124416" X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="287124416" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 15:16:29 -0700 IronPort-SDR: hyu6LDxqE7bbFOlgjYkanhZil89vEUluqIT/QYLYL6MAJnvV2JZuIE9NY6CClaH2AaqvUjkyLo lAWIoEyi3Zmg== X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="441269442" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 15:16:29 -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 v27 05/10] x86/cet/ibt: Update ELF header parsing for Indirect Branch Tracking Date: Fri, 21 May 2021 15:15:26 -0700 Message-Id: <20210521221531.30168-6-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210521221531.30168-1-yu-cheng.yu@intel.com> References: <20210521221531.30168-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 An ELF file's .note.gnu.property indicates features the file supports. The property is parsed at loading time and passed to arch_setup_elf_ property(). Update it for Indirect Branch Tracking. Signed-off-by: Yu-cheng Yu Cc: Kees Cook --- v27: - Remove selecting of ARCH_USE_GNU_PROPERTY and ARCH_BINFMT_ELF_STATE, since they are already selected by X86_64. arch/x86/kernel/process_64.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 1742c16945ef..607b782afe2c 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -860,6 +860,14 @@ int arch_setup_elf_property(struct arch_elf_state *state) if (state->gnu_property & GNU_PROPERTY_X86_FEATURE_1_SHSTK) r = shstk_setup(); } + + if (r < 0) + return r; + + if (cpu_feature_enabled(X86_FEATURE_IBT)) { + if (state->gnu_property & GNU_PROPERTY_X86_FEATURE_1_IBT) + r = ibt_setup(); + } #endif return r; -- 2.21.0