Hi Sasha, On Sat, 2024-01-20 at 19:21 -0500, Sasha Levin wrote: > This is a note to let you know that I've just added the patch titled > > KEYS: encrypted: Add check for strsep > > to the 6.7-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The upstream patch needs to be reverted. Please don't backport it. thanks, Mimi > The filename of the patch is: > keys-encrypted-add-check-for-strsep.patch > and it can be found in the queue-6.7 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > commit 2f847e1f37f817057e8f333ebf66f37c6e682902 > Author: Chen Ni <nichen@xxxxxxxxxxx> > Date: Wed Nov 8 07:36:27 2023 +0000 > > KEYS: encrypted: Add check for strsep > > [ 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> > > 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:
