From: Greg Kroah-Hartman Date: Sun, 20 Oct 2024 09:25:37 +0000 (+0200) Subject: fix up x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch for 4.14 and 5.4 X-Git-Tag: v5.10.228~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d98f2a01fdd3fa3870c61436d1239a3c9b76a64;p=thirdparty%2Fkernel%2Fstable-queue.git fix up x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch for 4.14 and 5.4 --- diff --git a/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch index 6ded8875898..7025452c349 100644 --- a/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch +++ b/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman #define X86_FEATURE_VIRT_SSBD (13*32+25) /* Virtualized Speculative Store Bypass Disable */ #define X86_FEATURE_AMD_SSB_NO (13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */ #define X86_FEATURE_BTC_NO (13*32+29) /* "" Not vulnerable to Branch Type Confusion */ -+#define X86_FEATURE_AMD_IBPB_RET (13*32+30) /* IBPB clears return address predictor */ ++#define X86_FEATURE_AMD_IBPB_RET (13*32+30) /* "" IBPB clears return address predictor */ /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */ #define X86_FEATURE_DTHERM (14*32+ 0) /* Digital Thermal Sensor */ diff --git a/queue-5.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-5.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch index 835af595850..8820a367ecb 100644 --- a/queue-5.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch +++ b/queue-5.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman #define X86_FEATURE_VIRT_SSBD (13*32+25) /* Virtualized Speculative Store Bypass Disable */ #define X86_FEATURE_AMD_SSB_NO (13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */ #define X86_FEATURE_BTC_NO (13*32+29) /* "" Not vulnerable to Branch Type Confusion */ -+#define X86_FEATURE_AMD_IBPB_RET (13*32+30) /* IBPB clears return address predictor */ ++#define X86_FEATURE_AMD_IBPB_RET (13*32+30) /* "" IBPB clears return address predictor */ /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */ #define X86_FEATURE_DTHERM (14*32+ 0) /* Digital Thermal Sensor */