| 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: |
