Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp836662pxf; Thu, 1 Apr 2021 15:12:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4zZYHnanBG3IU+iFLlOeHzxY8Z7oYGBhwhz0DZGnfulPSI4OMLSiOSBCcH9/fehpcOg+7 X-Received: by 2002:a17:907:7699:: with SMTP id jv25mr10917823ejc.363.1617315138515; Thu, 01 Apr 2021 15:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617315138; cv=none; d=google.com; s=arc-20160816; b=EtiTDdrYeom3lr1BgjA6JrjtmZjTcF1bCl3bwpwevu/G3xYSre1pmer4MCRF7n/U2h Yn32jfqzH8pwpncSReKMEaFpUuPfCVjLapALAxYss+tNDcsyr9uTvu4sr/t1amLREEoJ wTy6SXxA7GBKhuzEYHMcjAztioP1NntmzRc/vrEd9syfSxfE2hEJCQqSX1GGPs2v86uS I6FfS9OJIq/UfxmepvuxKKUFMsPQ94DzzFTUxgpKw0VLky4OfgMRIR9jMa5LUht1xF5J lLr9imbqi69gpO7mDTegsHUTrxSSoN48vHQ/LndZmnLebiPYZMCSIckpmEzs5q42wkcE 9uWg== 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=+TSVmxBdtWCmJkYKVZEQ92suQsHv8Lq7u7w9CeQR3zQ=; b=WhNS3k1m/c2o7SD1aNPNpDkGZq2ji31WP2a2ucc0T/CEatYpLZ8+tb9d3vBjhLyEmv 7MMYcpBbK1hkCwEfsMePtygdzz4N9vbUHCD/iOHlaAB0Fam0s/zDtPYedsFf9YsXYOYE M71fY8ti0mMZd5+hO/7WQ1l5ye9JVSjWGzPFbQusFnF+h1vh2vh1PHHxw2X5zT1udoRo 38mh2XDIWhuQ4U3/gxlF0u0RdKHLrJOkqW+FtfKFEHhx1Sg9b6wm2Ls1NL26s5abZEzJ xE1TKDH4WZ/1Euyx1xbNnQ0uKCihWmohUeo6HPF5wz3rCAyPuTRrxOVa/3Fp40IKt3N9 c4Fw== 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 hb30si5283685ejc.218.2021.04.01.15.11.54; Thu, 01 Apr 2021 15:12:18 -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 S234117AbhDAWLX (ORCPT + 99 others); Thu, 1 Apr 2021 18:11:23 -0400 Received: from mga11.intel.com ([192.55.52.93]:34672 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233816AbhDAWLT (ORCPT ); Thu, 1 Apr 2021 18:11:19 -0400 IronPort-SDR: uVRUUPbjgbFTKe9KqUsaOiwYsZ4iMkAKg7n+WKb1jNnL3g7wcAGVh7nDz8NdprMiUERIv1pE9d 925A3zxz1MLA== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="189084509" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="189084509" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 15:11:19 -0700 IronPort-SDR: CLJYmJfTc/21Pc/BayLqoTW3ht0ZjE8uZfmBGtHDSlKZVGESQgFaKT7x2SHPzLjpIKODqysA+E 52WiiNpYK/6g== X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="517513838" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 15:11:19 -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 v24 00/30] Control-flow Enforcement: Shadow Stack Date: Thu, 1 Apr 2021 15:10:34 -0700 Message-Id: <20210401221104.31584-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 already on the market. 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 v24: - Split shadow stack and IBT into separate Kconfig options and source files, update related areas accordingly. Specific changes are called out in each patch's commit log. - Patch #15: Instead of arch_maybe_mkwrite(), create x86 versions of maybe*_mkwrite(). - Patch #17: Instead changing vm_*_gap(), create x86 versions. - Patch #24, #25: Split signal handling into two patches, update comments/ logs. - Patch #29, #30: Update arch_validate_flags() and use that for checking PROT_SHSTK. - Rebase to Linus tree v5.12-rc5. [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 v23: https://lore.kernel.org/r/20210316151054.5405-1-yu-cheng.yu@intel.com/ [3] Indirect Branch Tracking patches v23. https://lore.kernel.org/r/20210316151320.6123-1-yu-cheng.yu@intel.com/ [4] I am holding off the selftests changes and working to get Reviewed-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 (30): Documentation/x86: Add CET description x86/cet/shstk: Add Kconfig option for Shadow Stack x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) x86/cpufeatures: Introduce X86_FEATURE_CET and setup functions x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states x86/cet: Add control-protection fault handler x86/mm: Remove _PAGE_DIRTY from kernel RO pages x86/mm: Move pmd_write(), pud_write() up in the file 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 to _PAGE_COW mm: Introduce VM_SHADOW_STACK 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/mprotect: Exclude shadow stack from preserve_write mm: Re-introduce vm_flags to do_mmap() x86/cet/shstk: Add user-mode shadow stack support x86/cet/shstk: Handle thread shadow stack x86/cet/shstk: Introduce shadow stack token setup/verify routines x86/cet/shstk: Handle signals for shadow stack ELF: Introduce arch_setup_elf_property() x86/cet/shstk: Add arch_prctl functions for shadow stack mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.h mm: Update arch_validate_flags() to include vma anonymous mm: Introduce PROT_SHSTK for shadow stack .../admin-guide/kernel-parameters.txt | 6 + Documentation/filesystems/proc.rst | 1 + Documentation/x86/index.rst | 1 + Documentation/x86/intel_cet.rst | 136 ++++++++ arch/arm64/include/asm/elf.h | 5 + arch/arm64/include/asm/mman.h | 4 +- arch/sparc/include/asm/mman.h | 4 +- arch/x86/Kconfig | 28 ++ arch/x86/Kconfig.assembler | 5 + arch/x86/ia32/ia32_signal.c | 16 + arch/x86/include/asm/cet.h | 52 +++ arch/x86/include/asm/cpufeatures.h | 4 +- arch/x86/include/asm/disabled-features.h | 17 +- arch/x86/include/asm/elf.h | 13 + arch/x86/include/asm/fpu/internal.h | 2 + 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 | 87 +++++ arch/x86/include/asm/mmu_context.h | 3 + arch/x86/include/asm/msr-index.h | 19 ++ arch/x86/include/asm/page_types.h | 17 + arch/x86/include/asm/pgtable.h | 298 +++++++++++++++-- arch/x86/include/asm/pgtable_types.h | 48 ++- 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 | 3 + arch/x86/kernel/cet_prctl.c | 60 ++++ arch/x86/kernel/cpu/common.c | 14 + arch/x86/kernel/cpu/cpuid-deps.c | 2 + arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/fpu/signal.c | 143 ++++++++ arch/x86/kernel/fpu/xstate.c | 10 +- arch/x86/kernel/idt.c | 4 + arch/x86/kernel/process.c | 21 +- arch/x86/kernel/process_64.c | 32 ++ arch/x86/kernel/shstk.c | 309 ++++++++++++++++++ arch/x86/kernel/signal.c | 9 + arch/x86/kernel/signal_compat.c | 2 +- arch/x86/kernel/traps.c | 63 ++++ arch/x86/mm/fault.c | 19 ++ arch/x86/mm/mmap.c | 38 +++ arch/x86/mm/pat/set_memory.c | 2 +- arch/x86/mm/pgtable.c | 27 ++ 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 | 18 +- include/linux/mman.h | 2 +- include/linux/pgtable.h | 11 + 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 | 17 +- mm/memory.c | 5 +- mm/migrate.c | 3 +- mm/mmap.c | 17 +- mm/mprotect.c | 13 +- mm/nommu.c | 4 +- mm/util.c | 2 +- 68 files changed, 1664 insertions(+), 109 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_prctl.c create mode 100644 arch/x86/kernel/shstk.c -- 2.21.0