summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-04-02 00:10:12 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2020-04-03 15:37:26 +1100
commit755bddd1e4eaf9178758bd554c60aaab46fc42ba (patch)
tree16765832160e4549ab98088c9ec5eec208de5c4b /drivers/crypto
parentb5f13031cd8da1b8f1e277d03a773dc46f7cff11 (diff)
downloadlinux-755bddd1e4eaf9178758bd554c60aaab46fc42ba.tar.gz
linux-755bddd1e4eaf9178758bd554c60aaab46fc42ba.tar.bz2
linux-755bddd1e4eaf9178758bd554c60aaab46fc42ba.zip
crypto: marvell/octeontx - fix double free of ptr
Currently in the case where eq->src != req->ds, the allocation of ptr is kfree'd at the end of the code block. However later on in the case where enc is not null any of the error return paths that return via the error handling return path end up performing an erroneous second kfree of ptr. Fix this by adding an error exit label error_free and only jump to this when ptr needs kfree'ing thus avoiding the double free issue. Addresses-Coverity: ("Double free") Fixes: 10b4f09491bf ("crypto: marvell - add the Virtual Function driver for CPT") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/marvell/octeontx/otx_cptvf_algs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c b/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
index 946fb62949b2..06202bcffb33 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
@@ -1161,13 +1161,13 @@ static inline u32 create_aead_null_output_list(struct aead_request *req,
inputlen);
if (status != inputlen) {
status = -EINVAL;
- goto error;
+ goto error_free;
}
status = sg_copy_from_buffer(req->dst, sg_nents(req->dst), ptr,
inputlen);
if (status != inputlen) {
status = -EINVAL;
- goto error;
+ goto error_free;
}
kfree(ptr);
}
@@ -1209,8 +1209,10 @@ static inline u32 create_aead_null_output_list(struct aead_request *req,
req_info->outcnt = argcnt;
return 0;
-error:
+
+error_free:
kfree(ptr);
+error:
return status;
}