6.1-stable patches

added patches:
	revert-keys-encrypted-add-check-for-strsep.patch

diff --git a/queue-6.1/revert-keys-encrypted-add-check-for-strsep.patch b/queue-6.1/revert-keys-encrypted-add-check-for-strsep.patch
new file mode 100644 (file)
index 0000000..d52c389
--- /dev/null
+++ b/queue-6.1/revert-keys-encrypted-add-check-for-strsep.patch
@@ -0,0 +1,35 @@
+From 1ed4b563100230ea68821a2b25a3d9f25388a3e6 Mon Sep 17 00:00:00 2001
+From: Mimi Zohar <zohar@linux.ibm.com>
+Date: Wed, 24 Jan 2024 14:21:44 -0500
+Subject: Revert "KEYS: encrypted: Add check for strsep"
+
+From: Mimi Zohar <zohar@linux.ibm.com>
+
+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@intel.com>
+Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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:

diff --git a/queue-6.1/series b/queue-6.1/series
index b040127ac8ddac85b33766e7f4024aaa7cc634cf..d858d70919c44dc683c984a6ea5faa0ba894795a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -412,3 +412,4 @@ i2c-s3c24xx-fix-read-transfers-in-polling-mode.patch
 i2c-s3c24xx-fix-transferring-more-than-one-message-i.patch
 block-remove-special-casing-of-compound-pages.patch
 riscv-fix-wrong-usage-of-lm_alias-when-splitting-a-huge-linear-mapping.patch
+revert-keys-encrypted-add-check-for-strsep.patch