From: Greg Kroah-Hartman Date: Mon, 29 Apr 2024 13:48:01 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v4.19.313~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aeebb5e96bd05559e27d7d64e888e08a61c6868a;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: x86-tdx-preserve-shared-bit-on-mprotect.patch --- diff --git a/queue-6.6/series b/queue-6.6/series index 900c8600b8c..b2aed3a202a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -153,3 +153,4 @@ udp-preserve-the-connected-status-if-only-udp-cmsg.patch mtd-diskonchip-work-around-ubsan-link-failure.patch phy-qcom-qmp-combo-fix-register-base-for-qserdes_dp_phy_mode.patch phy-qcom-qmp-combo-fix-vco-div-offset-on-v3.patch +x86-tdx-preserve-shared-bit-on-mprotect.patch diff --git a/queue-6.6/x86-tdx-preserve-shared-bit-on-mprotect.patch b/queue-6.6/x86-tdx-preserve-shared-bit-on-mprotect.patch new file mode 100644 index 00000000000..fb35f4408c6 --- /dev/null +++ b/queue-6.6/x86-tdx-preserve-shared-bit-on-mprotect.patch @@ -0,0 +1,80 @@ +From a0a8d15a798be4b8f20aca2ba91bf6b688c6a640 Mon Sep 17 00:00:00 2001 +From: "Kirill A. Shutemov" +Date: Wed, 24 Apr 2024 11:20:35 +0300 +Subject: x86/tdx: Preserve shared bit on mprotect() + +From: Kirill A. Shutemov + +commit a0a8d15a798be4b8f20aca2ba91bf6b688c6a640 upstream. + +The TDX guest platform takes one bit from the physical address to +indicate if the page is shared (accessible by VMM). This bit is not part +of the physical_mask and is not preserved during mprotect(). As a +result, the 'shared' bit is lost during mprotect() on shared mappings. + +_COMMON_PAGE_CHG_MASK specifies which PTE bits need to be preserved +during modification. AMD includes 'sme_me_mask' in the define to +preserve the 'encrypt' bit. + +To cover both Intel and AMD cases, include 'cc_mask' in +_COMMON_PAGE_CHG_MASK instead of 'sme_me_mask'. + +Reported-and-tested-by: Chris Oo + +Fixes: 41394e33f3a0 ("x86/tdx: Extend the confidential computing API to support TDX guests") +Signed-off-by: Kirill A. Shutemov +Signed-off-by: Dave Hansen +Reviewed-by: Rick Edgecombe +Reviewed-by: Kuppuswamy Sathyanarayanan +Reviewed-by: Tom Lendacky +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/all/20240424082035.4092071-1-kirill.shutemov%40linux.intel.com +Signed-off-by: Kirill A. Shutemov +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/include/asm/coco.h | 5 ++++- + arch/x86/include/asm/pgtable_types.h | 3 ++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +--- a/arch/x86/include/asm/coco.h ++++ b/arch/x86/include/asm/coco.h +@@ -12,9 +12,10 @@ enum cc_vendor { + }; + + extern enum cc_vendor cc_vendor; +-extern u64 cc_mask; + + #ifdef CONFIG_ARCH_HAS_CC_PLATFORM ++extern u64 cc_mask; ++ + static inline void cc_set_mask(u64 mask) + { + RIP_REL_REF(cc_mask) = mask; +@@ -24,6 +25,8 @@ u64 cc_mkenc(u64 val); + u64 cc_mkdec(u64 val); + void cc_random_init(void); + #else ++static const u64 cc_mask = 0; ++ + static inline u64 cc_mkenc(u64 val) + { + return val; +--- a/arch/x86/include/asm/pgtable_types.h ++++ b/arch/x86/include/asm/pgtable_types.h +@@ -148,7 +148,7 @@ + #define _COMMON_PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ + _PAGE_SPECIAL | _PAGE_ACCESSED | \ + _PAGE_DIRTY_BITS | _PAGE_SOFT_DIRTY | \ +- _PAGE_DEVMAP | _PAGE_ENC | _PAGE_UFFD_WP) ++ _PAGE_DEVMAP | _PAGE_CC | _PAGE_UFFD_WP) + #define _PAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PAT) + #define _HPAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PSE | _PAGE_PAT_LARGE) + +@@ -173,6 +173,7 @@ enum page_cache_mode { + }; + #endif + ++#define _PAGE_CC (_AT(pteval_t, cc_mask)) + #define _PAGE_ENC (_AT(pteval_t, sme_me_mask)) + + #define _PAGE_CACHE_MASK (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)