Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp4833115pxy; Tue, 27 Apr 2021 13:48:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUyFbNZB9UEPdMy1kKOyF3BPNOBPi443Tbn2GbNfP90WKyCnqy1zj9blvNVeak6hHi/3VS X-Received: by 2002:a63:a42:: with SMTP id z2mr23747703pgk.52.1619556530118; Tue, 27 Apr 2021 13:48:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619556530; cv=none; d=google.com; s=arc-20160816; b=oqZ5lqjSAFURLPGXqPwWs/6OayrK/Kttt7v++kXKIJc3+ujMgmb9idJs64j2eCKPE1 WbXnhBufrM5FeRxuos3VVMnKMDCGLCHiMJsNiPZp2gUrkkLOICUHFItkQdfTFFFOfTYt SVNXLlXuhaCq10GFvMLVeU2440Cn/sDg20xA6ydNtirani50tdrKxrHZkIpHlzXV3weC RO8kPRJ+b7YPul6XVGXkLFJofu9GIcBm6GHbIGcCLFZz7hHIqEmnM1d7eNTv/fy6Fneb uk3tGmR45thuTbGe21CSNWXc5Y4364HMUJyWai3gKx8CpmI4qehDPCs6FB9rF5VSJBu8 1AXw== 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=b+aNL018i32n9pGa/ifq3F+ww3o6OF0ft5ZVpPslufI=; b=vqwCYqrpUf5YLjKpOrJ1iHYVsKwLeS/yBL3PMUu2B/IwlpPnC0tt5SWqiRgvdG+7zE wYtMCX9TWsRyxwvPhuBJEeaLlLfoDY2Ea3AvDdiRq8ngKOZ8zpN2CzuusDZnuBa8Hlvk UrzzJZyNNbYY3ph8Vw2M69/ootanmNUnhxFd5ZSnC0dPDi0aVWr0s5+p+hDz5bweCCQ6 h84OmACHTRJbc8jVEewDQjKtLOUdfcQ/2qf5llFvdIDBJrln07t2wmru2jQcMyeFNUOn Aa+6kexliq1i5MQcqV1xdyWKLWanPbjQPHRSajyskC/1Wf06mDUyBi1hkNoyYitl7Y19 h1aw== 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 x129si109258pgb.299.2021.04.27.13.48.37; Tue, 27 Apr 2021 13:48:50 -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 S239041AbhD0Usl (ORCPT + 99 others); Tue, 27 Apr 2021 16:48:41 -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 S239117AbhD0Usc (ORCPT ); Tue, 27 Apr 2021 16:48:32 -0400 IronPort-SDR: LmrFdP3Fbeerw+FIWnpgtCtq6Zb0/pwH8sQMYKkto7dz29ek4pkAQYM/x/+59XwNZnuGmMXJaP PIywFv0A2O/A== X-IronPort-AV: E=McAfee;i="6200,9189,9967"; a="196699371" X-IronPort-AV: E=Sophos;i="5.82,255,1613462400"; d="scan'208";a="196699371" 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:46 -0700 IronPort-SDR: 4wycrG0YscEnQRkoH+NLgzG1p2lzpH6RyGw5R6bcJ4HsGNJudeECn8n1PXiq6KVpH8qYpjjQGb s6cju3hVWtAg== X-IronPort-AV: E=Sophos;i="5.82,255,1613462400"; d="scan'208";a="457835067" 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:45 -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 0/9] Control-flow Enforcement: Indirect Branch Tracking Date: Tue, 27 Apr 2021 13:47:11 -0700 Message-Id: <20210427204720.25007-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 v26: - Rebase to Linus tree v5.12. Changes in v25: - Make updates to Kconfig and CPU feature flags for the removal of Kconfig X86_CET and software-defined X86_FEATURE_CET. - Update ENDBR definition. - Rebase to Linus tree v5.12-rc7. [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 v25: https://lore.kernel.org/r/20210415221734.32628-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 (6): 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: 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 | 21 +++++++++ arch/x86/entry/vdso/Makefile | 4 ++ arch/x86/entry/vdso/vdso32/system_call.S | 2 + arch/x86/entry/vdso/vsgx.S | 4 ++ arch/x86/include/asm/cet.h | 9 ++++ arch/x86/include/asm/disabled-features.h | 8 +++- arch/x86/include/asm/vdso.h | 20 ++++++++- arch/x86/include/uapi/asm/sigcontext.h | 1 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cet_prctl.c | 5 +++ arch/x86/kernel/fpu/signal.c | 33 ++++++++++++-- arch/x86/kernel/ibt.c | 57 ++++++++++++++++++++++++ arch/x86/kernel/process_64.c | 8 ++++ 13 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 arch/x86/kernel/ibt.c -- 2.21.0