ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

ima: fix reference leak in asymmetric_verify()

Browse Source 
Don't leak a reference to the key if its algorithm is unknown.

Fixes: 947d705972 ("ima: Support EC keys for signature verification")
Cc: <stable@vger.kernel.org> # v5.13+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Eric Biggers
2022-01-13 11:44:38 -08:00
committed by Mimi Zohar
parent e783362eb5
commit 926fd9f23b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
security/integrity/digsig_asymmetric.c
View File

@@ -109,22 +109,25 @@ int asymmetric_verify(struct key *keyring, const char *sig,
pk = asymmetric_key_public_key(key); pk = asymmetric_key_public_key(key);
pks.pkey_algo = pk->pkey_algo; pks.pkey_algo = pk->pkey_algo;
if (!strcmp(pk->pkey_algo, "rsa")) if (!strcmp(pk->pkey_algo, "rsa")) {
pks.encoding = "pkcs1"; pks.encoding = "pkcs1";
else if (!strncmp(pk->pkey_algo, "ecdsa-", 6)) } else if (!strncmp(pk->pkey_algo, "ecdsa-", 6)) {
/* edcsa-nist-p192 etc. */ /* edcsa-nist-p192 etc. */
pks.encoding = "x962"; pks.encoding = "x962";
else if (!strcmp(pk->pkey_algo, "ecrdsa") || } else if (!strcmp(pk->pkey_algo, "ecrdsa") ||
!strcmp(pk->pkey_algo, "sm2")) !strcmp(pk->pkey_algo, "sm2")) {
pks.encoding = "raw"; pks.encoding = "raw";
else } else {
return -ENOPKG; ret = -ENOPKG;
goto out;
}
pks.digest = (u8 *)data; pks.digest = (u8 *)data;
pks.digest_size = datalen; pks.digest_size = datalen;
pks.s = hdr->sig; pks.s = hdr->sig;
pks.s_size = siglen; pks.s_size = siglen;
ret = verify_signature(key, &pks); ret = verify_signature(key, &pks);
out:
key_put(key); key_put(key);
pr_debug("%s() = %d\n", __func__, ret); pr_debug("%s() = %d\n", __func__, ret);
return ret; return ret;