summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorChen Ni <nichen@iscas.ac.cn>2023-11-08 07:36:27 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-01-25 15:35:14 -0800
commit69c2d6e40d97ecc5dbb2f4db9a255b121809b3ac (patch)
treee34c7ab4443b65d8dc70164f0450a4c97908de00 /security
parentd1ac288b2742aa4af746c5613bac71760fadd1c4 (diff)
downloadlinux-stable-69c2d6e40d97ecc5dbb2f4db9a255b121809b3ac.tar.gz
linux-stable-69c2d6e40d97ecc5dbb2f4db9a255b121809b3ac.tar.bz2
linux-stable-69c2d6e40d97ecc5dbb2f4db9a255b121809b3ac.zip
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@iscas.ac.cn> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'security')
-rw-r--r--security/keys/encrypted-keys/encrypted.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 1e313982af02..fea7e0937150 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: