Skip to content

Commit f22face

Browse files
committed
Merge tag 'integrity-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity fix from Mimi Zohar: "Revert patch that required user-provided key data, since keys can be created from kernel-generated random numbers" * tag 'integrity-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: Revert "KEYS: encrypted: Add check for strsep"
2 parents cf10015 + 1ed4b56 commit f22face

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

security/keys/encrypted-keys/encrypted.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@ static int datablob_parse(char *datablob, const char **format,
237237
break;
238238
}
239239
*decrypted_data = strsep(&datablob, " \t");
240-
if (!*decrypted_data) {
241-
pr_info("encrypted_key: decrypted_data is missing\n");
242-
break;
243-
}
244240
ret = 0;
245241
break;
246242
case Opt_load:

0 commit comments

Comments
 (0)