android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: testmgr - Fix potential memory leak in test_akcipher_one()

Browse Source 
When the 'key' allocation fails, the 'req' will not be released,
which will cause memory leakage on this path. This patch adds a
'free_req' tag used to solve this problem, and two new err values
are added to reflect the real reason of the error.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tianjia Zhang 2020-09-21 00:20:59 +08:00 committed by Herbert Xu
parent a1f62c217d
commit 2b40386774
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/testmgr.c
View File

@ -3955,7 +3955,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
key = kmalloc(vecs->key_len + sizeof(u32) * 2 + vecs->param_len, key = kmalloc(vecs->key_len + sizeof(u32) * 2 + vecs->param_len,
GFP_KERNEL); GFP_KERNEL);
if (!key) if (!key)
goto free_xbuf; goto free_req;
memcpy(key, vecs->key, vecs->key_len); memcpy(key, vecs->key, vecs->key_len);
ptr = key + vecs->key_len; ptr = key + vecs->key_len;
ptr = test_pack_u32(ptr, vecs->algo); ptr = test_pack_u32(ptr, vecs->algo);
@ -3967,7 +3967,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
else else
err = crypto_akcipher_set_priv_key(tfm, key, vecs->key_len); err = crypto_akcipher_set_priv_key(tfm, key, vecs->key_len);
if (err) if (err)
goto free_req; goto free_key;
/* /*
* First run test which do not require a private key, such as * First run test which do not require a private key, such as
@ -3977,7 +3977,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
out_len_max = crypto_akcipher_maxsize(tfm); out_len_max = crypto_akcipher_maxsize(tfm);
outbuf_enc = kzalloc(out_len_max, GFP_KERNEL); outbuf_enc = kzalloc(out_len_max, GFP_KERNEL);
if (!outbuf_enc) if (!outbuf_enc)
goto free_req; goto free_key;
if (!vecs->siggen_sigver_test) { if (!vecs->siggen_sigver_test) {
m = vecs->m; m = vecs->m;
@ -3996,6 +3996,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
op = "verify"; op = "verify";
} }
err = -E2BIG;
if (WARN_ON(m_size > PAGE_SIZE)) if (WARN_ON(m_size > PAGE_SIZE))
goto free_all; goto free_all;
memcpy(xbuf[0], m, m_size); memcpy(xbuf[0], m, m_size);
@ -4062,6 +4063,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
c_size = req->dst_len; c_size = req->dst_len;
} }
err = -E2BIG;
op = vecs->siggen_sigver_test ? "sign" : "decrypt"; op = vecs->siggen_sigver_test ? "sign" : "decrypt";
if (WARN_ON(c_size > PAGE_SIZE)) if (WARN_ON(c_size > PAGE_SIZE))
goto free_all; goto free_all;
@ -4098,9 +4100,10 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
free_all: free_all:
kfree(outbuf_dec); kfree(outbuf_dec);
kfree(outbuf_enc); kfree(outbuf_enc);
free_key:
kfree(key);
free_req: free_req:
akcipher_request_free(req); akcipher_request_free(req);
kfree(key);
free_xbuf: free_xbuf:
testmgr_free_buf(xbuf); testmgr_free_buf(xbuf);
return err; return err;