summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.ibm.com>2024-01-24 14:21:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-01-25 15:45:31 -0800
commitb5beb861861c7d63fec0f96387fbedef566c099c (patch)
tree5d2dd2f0ac36c3e5cd61bb714a76fc9d1f8390b8
parent63dee5ad48c3ba0ecf37d3e9f8fd2cd58c4032b0 (diff)
downloadlinux-stable-b5beb861861c7d63fec0f96387fbedef566c099c.tar.gz
linux-stable-b5beb861861c7d63fec0f96387fbedef566c099c.tar.bz2
linux-stable-b5beb861861c7d63fec0f96387fbedef566c099c.zip
Revert "KEYS: encrypted: Add check for strsep"
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>
-rw-r--r--security/keys/encrypted-keys/encrypted.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 76f55dd13cb8..8af2136069d2 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -237,10 +237,6 @@ static int datablob_parse(char *datablob, const char **format,
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: