diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-24 16:51:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-24 16:51:59 -0800 |
| commit | f22face166ef6327fe5b2cab61d2a78578b94534 (patch) | |
| tree | 230ac61ddad29d2128aad835f9ce72bff9ee582d | |
| parent | cf10015a24f36a82370151a88cb8610c8779e927 (diff) | |
| parent | 1ed4b563100230ea68821a2b25a3d9f25388a3e6 (diff) | |
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"
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 4 |
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: |