Skip to contentSkip to conversation

FAILED: patch "[PATCH] selftests/lkdtm: Fix expected text for CR4 pinning" failed to apply to 5.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 15, 2021

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c2eb472bbe25b3f360990f23b293b3fbadfa4bc0 Mon Sep 17 00:00:00 2001
From: Kees Cook <[email protected]>
Date: Wed, 23 Jun 2021 13:39:29 -0700
Subject: [PATCH] selftests/lkdtm: Fix expected text for CR4 pinning

The error text for CR4 pinning changed. Update the test to match.

Fixes a13b9d0b9721 ("x86/cpu: Use pinning mask for CR4 bits needing to be 0")
tools/testing/selftests/lkdtm/tests.txt +1 -1
index 11ef159be0fd..a5fce7fd4520 100644
@@ -11,7 +11,7 @@ CORRUPT_LIST_ADD list_add corruption
 CORRUPT_LIST_DEL list_del corruption
 STACK_GUARD_PAGE_LEADING
 STACK_GUARD_PAGE_TRAILING
-UNSET_SMEP CR4 bits went missing
+UNSET_SMEP pinned CR4 bits changed:
 DOUBLE_FAULT
 CORRUPT_PAC
 UNALIGNED_LOAD_STORE_WRITE