Hi Greg,
On Mon, 2024-01-22 at 15:48 -0800, Greg Kroah-Hartman wrote:
> 6.7-stable review patch. If anyone has any objections, please let me know.
The upstream patch needs to be reverted. Please don't backport it.
Thanks,
Mimi
>
> ------------------
>
> From: Chen Ni <nichen@xxxxxxxxxxx>
>
> [ Upstream commit b4af096b5df5dd131ab796c79cedc7069d8f4882 ]
>
> Add check for strsep() in order to transfer the error.
>
> Fixes: cd3bc044af48 ("KEYS: encrypted: Instantiate key with user-provided decrypted data")
> Signed-off-by: Chen Ni <nichen@xxxxxxxxxxx>
> Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> security/keys/encrypted-keys/encrypted.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
> index 8af2136069d2..76f55dd13cb8 100644
> --- a/security/keys/encrypted-keys/encrypted.c
> +++ b/security/keys/encrypted-keys/encrypted.c
> @@ -237,6 +237,10 @@ 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:
