Skip to content

Commit

Permalink
Revert "KEYS: encrypted: Add check for strsep"
Browse files Browse the repository at this point in the history
commit 1ed4b56 upstream.

This reverts commit b4af096.

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>
  • Loading branch information
mimizohar authored and gregkh committed Jan 25, 2024
1 parent b1cc57f commit 17062a7
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions security/keys/encrypted-keys/encrypted.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 17062a7

Please sign in to comment.