Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp4123679pxb; Tue, 10 Nov 2020 08:28:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9iWx+CQfcK+c5c0yxTd3ra6sD8NV1Q9ceM1a1lb9qiJ1f2YuMllsTwXATkRE5ScErA4Wk X-Received: by 2002:a05:6402:17ac:: with SMTP id j12mr108196edy.31.1605025734183; Tue, 10 Nov 2020 08:28:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605025734; cv=none; d=google.com; s=arc-20160816; b=txqmnKxsBUJ+UnwSnMZ18k4u3gKWJuGNpwpeOtK/Lq/WlnBZJbElhpSjG69BEgzako e6WcYMOi+lfmQ8PTCD/0JWhPYjYn2AXXFqpw9EcO6BwUJA3kuWoElcu+PwdeRAKN/CMU wBzoY+841KRsSYpVDWvRcqL/ak7paPEv4BO7GDTsrI95n8Tlx3slXCTniASSETc/+9xb rnbEc6hUWmUOyvmRnq6uPMYWHuTgj6N7o38XNnbRH0WsqKY/HTiJdFkVK7itYt543UHe RgqIaXJlj7HsaJ8KqgkSVLrvI1cCxkV2iZDrfcqJYFjvdbgLnfBuiYqJsKm/7SX85qFv vemw== 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=fnR1bc+gmUFaVnUmdMRhvsDPuw8e0l8bZXOOMZx8e70=; b=bZTU/9NqX18a/J3sFe+E11q7iO/Lblo9725FkEK14oFU0TxbqVmFir++J2ejwtT3zB BzeVTKvdmu8Jw18y7jOiK3dIrMdK4ywWA2kWnTc0IUDNHFKWA2YHLGt8xM382n9e8f8e LciyFNpDX2kdCzHObhRZzCdtPwatQUSHm5tqcKNOAtlMwLM2oUtcSOKCmiYWMDshU/mi e/0Vw/1Yr45LXOZo+b0qPjSskrTkxev1BHMKhaK9R3EnwAjOrNCxPvEoxFce6V3XC+2J qj4rySiNhM69Q8ZITqsT/ZrB6VUepx4E1wrFdyDQLVgmpM49mKaleCYc0RnXjA1DVdpo ZMYA== 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 m16si9240910ejc.357.2020.11.10.08.28.30; Tue, 10 Nov 2020 08:28:54 -0800 (PST) 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 S1729359AbgKJQWv (ORCPT + 99 others); Tue, 10 Nov 2020 11:22:51 -0500 Received: from mga02.intel.com ([134.134.136.20]:25984 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726152AbgKJQWu (ORCPT ); Tue, 10 Nov 2020 11:22:50 -0500 IronPort-SDR: B/SaJd0aBJ2ublWO/T4ZH7zC7X4FocVY/snwZneBgwq+fFH+aAOuOHbKAVBnEZ5e7wTe3Y6djL i/lAB5116z/w== X-IronPort-AV: E=McAfee;i="6000,8403,9801"; a="157008693" X-IronPort-AV: E=Sophos;i="5.77,466,1596524400"; d="scan'208";a="157008693" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2020 08:22:48 -0800 IronPort-SDR: voCdaSCLuIPmC7FQBRHOih+BWmmYGm7fBh5DugE0GC/GtyQnSnrq0mpSWJL5rtNNyteVAgQrc1 IGUk/SdG/3dw== X-IronPort-AV: E=Sophos;i="5.77,466,1596524400"; d="scan'208";a="365572793" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2020 08:22:48 -0800 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 Cc: Yu-cheng Yu Subject: [PATCH v15 00/26] Control-flow Enforcement: Shadow Stack Date: Tue, 10 Nov 2020 08:21:45 -0800 Message-Id: <20201110162211.9207-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]. CET can protect applications and the kernel. This series enables only application-level protection, and has three parts: - Shadow stack [2], - Indirect branch tracking [3], and - Selftests [4]. I have run tests on these patches for quite some time, and they have been very stable. Linux distributions with CET are available now, and Intel processors with CET are becoming available. It would be nice if CET support can be accepted into the kernel. I will be working to address any issues should they come up. Changes in v15: - Rebase to v5.10-rc3. - Small changes to the documentation to make meanings clear. - Remove changes to tools/arch/x86/include/ files. - Remove Reviewed-by tags from patches that have been revised too many times. [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] CET Shadow Stack patches v14: https://lkml.kernel.org/r/20201012153850.26996-1-yu-cheng.yu@intel.com/ [3] Indirect Branch Tracking patches v14. https://lkml.kernel.org/r/20201012154530.28382-1-yu-cheng.yu@intel.com/ [4] I am holding off the selftests changes and working to get Acked-by's. The earlier version of the selftests patches: https://lkml.kernel.org/r/20200521211720.20236-1-yu-cheng.yu@intel.com/ [5] The kernel ptrace patch is tested with an Intel-internal updated GDB. I am holding off the kernel ptrace patch to re-test it with my earlier patch for fixing regset holes. Yu-cheng Yu (26): Documentation/x86: Add CET description x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) x86/fpu/xstate: Introduce CET MSR XSAVES supervisor states x86/cet: Add control-protection fault handler x86/cet/shstk: Add Kconfig option for user-mode Shadow Stack x86/mm: Change _PAGE_DIRTY to _PAGE_DIRTY_HW x86/mm: Remove _PAGE_DIRTY_HW from kernel RO pages x86/mm: Introduce _PAGE_COW drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS x86/mm: Update pte_modify for _PAGE_COW x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY_HW to _PAGE_COW mm: Introduce VM_SHSTK for shadow stack memory x86/mm: Shadow Stack page fault error checking x86/mm: Update maybe_mkwrite() for shadow stack mm: Fixup places that call pte_mkwrite() directly mm: Add guard pages around a shadow stack. mm/mmap: Add shadow stack pages to memory accounting mm: Update can_follow_write_pte() for shadow stack mm: Re-introduce vm_flags to do_mmap() x86/cet/shstk: User-mode shadow stack support x86/cet/shstk: Handle signals for shadow stack binfmt_elf: Define GNU_PROPERTY_X86_FEATURE_1_AND properties ELF: Introduce arch_setup_elf_property() x86/cet/shstk: Handle thread shadow stack x86/cet/shstk: Add arch_prctl functions for shadow stack mm: Introduce PROT_SHSTK for shadow stack .../admin-guide/kernel-parameters.txt | 6 + Documentation/x86/index.rst | 1 + Documentation/x86/intel_cet.rst | 138 +++++++ arch/arm64/include/asm/elf.h | 5 + arch/x86/Kconfig | 39 ++ arch/x86/ia32/ia32_signal.c | 17 + arch/x86/include/asm/cet.h | 42 +++ arch/x86/include/asm/cpufeatures.h | 2 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/elf.h | 13 + arch/x86/include/asm/fpu/internal.h | 10 + arch/x86/include/asm/fpu/types.h | 23 +- arch/x86/include/asm/fpu/xstate.h | 6 +- arch/x86/include/asm/idtentry.h | 4 + arch/x86/include/asm/mman.h | 83 +++++ arch/x86/include/asm/mmu_context.h | 3 + arch/x86/include/asm/msr-index.h | 20 + arch/x86/include/asm/page_64_types.h | 10 + arch/x86/include/asm/pgtable.h | 209 ++++++++++- arch/x86/include/asm/pgtable_types.h | 57 ++- arch/x86/include/asm/processor.h | 5 + arch/x86/include/asm/special_insns.h | 32 ++ arch/x86/include/asm/trap_pf.h | 2 + arch/x86/include/uapi/asm/mman.h | 28 +- arch/x86/include/uapi/asm/prctl.h | 4 + arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/include/uapi/asm/sigcontext.h | 9 + arch/x86/kernel/Makefile | 2 + arch/x86/kernel/cet.c | 343 ++++++++++++++++++ arch/x86/kernel/cet_prctl.c | 68 ++++ arch/x86/kernel/cpu/common.c | 28 ++ arch/x86/kernel/cpu/cpuid-deps.c | 2 + arch/x86/kernel/fpu/signal.c | 100 +++++ arch/x86/kernel/fpu/xstate.c | 25 +- arch/x86/kernel/idt.c | 4 + arch/x86/kernel/process.c | 14 +- arch/x86/kernel/process_64.c | 32 ++ arch/x86/kernel/relocate_kernel_64.S | 2 +- arch/x86/kernel/signal.c | 10 + arch/x86/kernel/signal_compat.c | 2 +- arch/x86/kernel/traps.c | 59 +++ arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/mm/fault.c | 19 + arch/x86/mm/mmap.c | 2 + arch/x86/mm/pat/set_memory.c | 2 +- arch/x86/mm/pgtable.c | 25 ++ drivers/gpu/drm/i915/gvt/gtt.c | 2 +- fs/aio.c | 2 +- fs/binfmt_elf.c | 4 + fs/proc/task_mmu.c | 3 + include/linux/elf.h | 6 + include/linux/mm.h | 38 +- include/linux/pgtable.h | 35 ++ include/uapi/asm-generic/siginfo.h | 3 +- include/uapi/linux/elf.h | 9 + ipc/shm.c | 2 +- mm/gup.c | 8 +- mm/huge_memory.c | 10 +- mm/memory.c | 5 +- mm/migrate.c | 3 +- mm/mmap.c | 23 +- mm/mprotect.c | 2 +- mm/nommu.c | 4 +- mm/util.c | 2 +- scripts/as-x86_64-has-shadow-stack.sh | 4 + 65 files changed, 1594 insertions(+), 90 deletions(-) create mode 100644 Documentation/x86/intel_cet.rst create mode 100644 arch/x86/include/asm/cet.h create mode 100644 arch/x86/include/asm/mman.h create mode 100644 arch/x86/kernel/cet.c create mode 100644 arch/x86/kernel/cet_prctl.c create mode 100755 scripts/as-x86_64-has-shadow-stack.sh -- 2.21.0