This is a note to let you know that I've just added the patch titled
selftests/lkdtm: Fix expected text for CR4 pinning
to the 5.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selftests-lkdtm-fix-expected-text-for-cr4-pinning.patch
and it can be found in the queue-5.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c2eb472bbe25b3f360990f23b293b3fbadfa4bc0 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@xxxxxxxxxxxx>
Date: Wed, 23 Jun 2021 13:39:29 -0700
Subject: selftests/lkdtm: Fix expected text for CR4 pinning
From: Kees Cook <keescook@xxxxxxxxxxxx>
commit c2eb472bbe25b3f360990f23b293b3fbadfa4bc0 upstream.
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")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210623203936.3151093-3-keescook@xxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/lkdtm/tests.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/testing/selftests/lkdtm/tests.txt
+++ b/tools/testing/selftests/lkdtm/tests.txt
@@ -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
Patches currently in stable-queue which might be from keescook@xxxxxxxxxxxx are
queue-5.12/selftests-lkdtm-fix-expected-text-for-cr4-pinning.patch
queue-5.12/wireless-wext-spy-fix-out-of-bounds-warning.patch
queue-5.12/drm-i915-display-do-not-zero-past-infoframes.vsc.patch
queue-5.12/drm-amd-display-avoid-hdcp-over-read-and-corruption.patch
queue-5.12/lkdtm-bugs-xfail-unaligned_load_store_write.patch
queue-5.12/qemu_fw_cfg-make-fw_cfg_rev_attr-a-proper-kobj_attribute.patch
queue-5.12/lkdtm-enable-double_fault-on-all-architectures.patch
queue-5.12/docs-makefile-use-config_shell-not-shell.patch
