This is a note to let you know that I've just added the patch titled
Revert "KEYS: encrypted: Add check for strsep"
to the 6.1-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:
revert-keys-encrypted-add-check-for-strsep.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1ed4b563100230ea68821a2b25a3d9f25388a3e6 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@xxxxxxxxxxxxx>
Date: Wed, 24 Jan 2024 14:21:44 -0500
Subject: Revert "KEYS: encrypted: Add check for strsep"
From: Mimi Zohar <zohar@xxxxxxxxxxxxx>
commit 1ed4b563100230ea68821a2b25a3d9f25388a3e6 upstream.
This reverts commit b4af096b5df5dd131ab796c79cedc7069d8f4882.
New encrypted keys are created either from kernel-generated random
numbers or user-provided decrypted data. Revert the change requiring
user-provided decrypted data.
Reported-by: Vishal Verma <vishal.l.verma@xxxxxxxxx>
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
security/keys/encrypted-keys/encrypted.c | 4 ----
1 file changed, 4 deletions(-)
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -237,10 +237,6 @@ static int datablob_parse(char *datablob
break;
}
*decrypted_data = strsep(&datablob, " \t");
- if (!*decrypted_data) {
- pr_info("encrypted_key: decrypted_data is missing\n");
- break;
- }
ret = 0;
break;
case Opt_load:
Patches currently in stable-queue which might be from zohar@xxxxxxxxxxxxx are
queue-6.1/revert-keys-encrypted-add-check-for-strsep.patch
queue-6.1/keys-encrypted-add-check-for-strsep.patch
queue-6.1/rootfs-fix-support-for-rootfstype-when-root-is-given.patch
