Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1467975pxj; Fri, 21 May 2021 15:20:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgS4dN8woclcWn91MfPA5fVdX5eYm4hLrUzPUb1nsRQG3G1pc3FKnW6m+W+soXG22NpagI X-Received: by 2002:a50:bec1:: with SMTP id e1mr13439302edk.116.1621635631204; Fri, 21 May 2021 15:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621635631; cv=none; d=google.com; s=arc-20160816; b=UsMECoFx6HhaO3q2aW1KXStKLSBERUsdLMN4qGBepLdQ9Set3D6rzzDsIvTUiK05vq IA6MPFS05IIXTxTLgTZstU+N3Oapv3QH6zUjPppnv1vCax/Q+aOoOKzgFcwO6xCj6Ne8 MnVbPFl6LdZlucpeOhK1vg4/nJoiwlOvTXKJrUZHHPdH3MZUrGDajXJqT3fHaSchM/Kf Shz5W+OTNG0fuxWtAKG0wBYeKfDbIMg1fkUAXh0FTp6sM7TiVnjOZwlfPR25GEvQoOkF UiFqq0Rz/juADSifzx2VsGfH8VDhnnhRnkH1Vhri4EZ9Nz5OSUX6rB29n4rwX3ikX93+ LmrA== 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 :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=8oKzQZQLvn2Oz3U2Tzne81lsQvUQM69h/Iu8Q6HuW8A=; b=k/SjhBDD5U4aIH/KEjGTVQVPHu7BWi1S0b9Fh97f6wmzTDmYaNeOAl+GQ82zLAJvFI aITQCsgCZYBey+AS1qTc7lSU7arZX6AxyuwlRGEyhkAwf9LwxoN83uyfMG2URced3GYB 7UAb8WRuqEyIJueZ2Vcf1j7zf1outSnJA4W0rNC/CXcABRBzSYf2oAmkUwy0tZEYHkMf +oTPDyXvYwegU7xNu3Ei2y8B/eypY3AQEWDotfHyxXuo4ZeXd3RE5iSzbXm4BF9BBik7 oMFxV6XhpsWNUxW7b+t0DOUybOkfX/UicPAPcB77Sc00bZs/w9Z2H6wJ8XQY/ZK1l/ug O8+w== 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 f25si6401807eja.351.2021.05.21.15.20.07; Fri, 21 May 2021 15:20:31 -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 S229952AbhEUWSk (ORCPT + 99 others); Fri, 21 May 2021 18:18:40 -0400 Received: from mga05.intel.com ([192.55.52.43]:55706 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbhEUWSe (ORCPT ); Fri, 21 May 2021 18:18:34 -0400 IronPort-SDR: tQfxeu0W+ZZPw2AXVOtH6J2qVv6TW5D1yKvylTvBEF6BqoTMjIQHcKPb3gvFXCWjfc+zrzETHT G9YALvtYDCFQ== X-IronPort-AV: E=McAfee;i="6200,9189,9991"; a="287124411" X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="287124411" 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:28 -0700 IronPort-SDR: VeDJ4dRZPoXJ0JOgGY9taVtnV4mxx/Xzdzs1Zjsnf7gLo4dyvn4SAHdMx3DD+KScH2JnQHV9v1 ZzN8ehK1AKSA== X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="441269422" 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:28 -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 00/10] Control-flow Enforcement: Indirect Branch Tracking Date: Fri, 21 May 2021 15:15:21 -0700 Message-Id: <20210521221531.30168-1-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Control-flow Enforcement (CET) is a new Intel processor feature that blocks return/jump-oriented programming attacks. Details are in "Intel 64 and IA-32 Architectures Software Developer's Manual" [1]. This is the second part of CET and enables Indirect Branch Tracking (IBT). It is built on top of the shadow stack series. Changes in v27: - Use a ucontext flag to save/restore IBT status. - Disable IBT support for IA32. - Rebase to Linus tree v5.13-rc2. [1] Intel 64 and IA-32 Architectures Software Developer's Manual: https://software.intel.com/en-us/download/intel-64-and-ia-32- architectures-sdm-combined-volumes-1-2a-2b-2c-2d-3a-3b-3c-3d-and-4 [2] Indirect Branch Tracking patches v26: https://lore.kernel.org/r/20210427204720.25007-1-yu-cheng.yu@intel.com/ H.J. Lu (3): x86/cet/ibt: Update arch_prctl functions for Indirect Branch Tracking x86/vdso: Insert endbr32/endbr64 to vDSO x86/vdso/32: Add ENDBR to __kernel_vsyscall entry point Yu-cheng Yu (7): x86/cet/ibt: Add Kconfig option for Indirect Branch Tracking x86/cet/ibt: Add user-mode Indirect Branch Tracking support x86/cet/ibt: Handle signals for Indirect Branch Tracking x86/cet/ibt: Disable IBT for ia32 x86/cet/ibt: Update ELF header parsing for Indirect Branch Tracking x86/vdso: Introduce ENDBR macro x86/vdso: Add ENDBR to __vdso_sgx_enter_enclave arch/x86/Kconfig | 19 +++++ arch/x86/entry/vdso/Makefile | 4 + arch/x86/entry/vdso/vdso32/system_call.S | 2 + arch/x86/entry/vdso/vsgx.S | 4 + arch/x86/ia32/ia32_signal.c | 22 +++++- arch/x86/include/asm/cet.h | 13 ++++ arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/elf.h | 13 +++- arch/x86/include/asm/vdso.h | 20 ++++- arch/x86/include/uapi/asm/ucontext.h | 5 ++ arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cet_prctl.c | 5 ++ arch/x86/kernel/ibt.c | 95 ++++++++++++++++++++++++ arch/x86/kernel/process_64.c | 8 ++ arch/x86/kernel/signal.c | 6 ++ 15 files changed, 219 insertions(+), 6 deletions(-) create mode 100644 arch/x86/kernel/ibt.c -- 2.21.0