Commit f22face1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'integrity-v6.8-rc1' of... 

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"
parents cf10015a 1ed4b563

security/keys/encrypted-keys/encrypted.c

+0 −4
Original line number Diff line number Diff line
@@ -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: