| Message ID | 20221114110740.537276-1-weiyongjun@huaweicloud.com |
|---|---|
| State | New |
| Headers | show |
| Series | virtio-crypto: fix memory leak in virtio_crypto_alg_skcipher_close_session() | expand |
> -----Original Message----- > From: Wei Yongjun [mailto:weiyongjun@huaweicloud.com] > Sent: Monday, November 14, 2022 7:08 PM > To: Michael S. Tsirkin <mst@redhat.com>; Jason Wang > <jasowang@redhat.com>; Gonglei (Arei) <arei.gonglei@huawei.com>; > Herbert Xu <herbert@gondor.apana.org.au>; David S. Miller > <davem@davemloft.net>; zhenwei pi <pizhenwei@bytedance.com> > Cc: weiyongjun (A) <weiyongjun1@huawei.com>; > virtualization@lists.linux-foundation.org; linux-crypto@vger.kernel.org > Subject: [PATCH] virtio-crypto: fix memory leak in > virtio_crypto_alg_skcipher_close_session() > > From: Wei Yongjun <weiyongjun1@huawei.com> > > 'vc_ctrl_req' is alloced in virtio_crypto_alg_skcipher_close_session(), > and should be freed in the invalid ctrl_status->status error handling case. > Otherwise there is a memory leak. > > Fixes: 0756ad15b1fe ("virtio-crypto: use private buffer for control request") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/crypto/virtio/virtio_crypto_skcipher_algs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > index e553ccadbcbc..e5876286828b 100644 > --- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > +++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > @@ -239,7 +239,8 @@ static int virtio_crypto_alg_skcipher_close_session( > pr_err("virtio_crypto: Close session failed status: %u, session_id: > 0x%llx\n", > ctrl_status->status, destroy_session->session_id); > > - return -EINVAL; > + err = -EINVAL; > + goto out; > } > Good catch. Reviewed-by: Gonglei <arei.gonglei@huawei.com> Regards, -Gonglei > err = 0; > -- > 2.34.1
Looks good to me, thanks! Acked-by: zhenwei pi<pizhenwei@bytedance.com> On 11/14/22 19:07, Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > 'vc_ctrl_req' is alloced in virtio_crypto_alg_skcipher_close_session(), > and should be freed in the invalid ctrl_status->status error handling > case. Otherwise there is a memory leak. > > Fixes: 0756ad15b1fe ("virtio-crypto: use private buffer for control request") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/crypto/virtio/virtio_crypto_skcipher_algs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > index e553ccadbcbc..e5876286828b 100644 > --- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > +++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > @@ -239,7 +239,8 @@ static int virtio_crypto_alg_skcipher_close_session( > pr_err("virtio_crypto: Close session failed status: %u, session_id: 0x%llx\n", > ctrl_status->status, destroy_session->session_id); > > - return -EINVAL; > + err = -EINVAL; > + goto out; > } > > err = 0;
On Mon, Nov 14, 2022 at 7:26 PM Wei Yongjun <weiyongjun@huaweicloud.com> wrote: > > From: Wei Yongjun <weiyongjun1@huawei.com> > > 'vc_ctrl_req' is alloced in virtio_crypto_alg_skcipher_close_session(), > and should be freed in the invalid ctrl_status->status error handling > case. Otherwise there is a memory leak. > > Fixes: 0756ad15b1fe ("virtio-crypto: use private buffer for control request") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Jason Wang <jasowang@redhat.com> Thanks > --- > drivers/crypto/virtio/virtio_crypto_skcipher_algs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > index e553ccadbcbc..e5876286828b 100644 > --- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > +++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c > @@ -239,7 +239,8 @@ static int virtio_crypto_alg_skcipher_close_session( > pr_err("virtio_crypto: Close session failed status: %u, session_id: 0x%llx\n", > ctrl_status->status, destroy_session->session_id); > > - return -EINVAL; > + err = -EINVAL; > + goto out; > } > > err = 0; > -- > 2.34.1 >
diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c index e553ccadbcbc..e5876286828b 100644 --- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c +++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c @@ -239,7 +239,8 @@ static int virtio_crypto_alg_skcipher_close_session( pr_err("virtio_crypto: Close session failed status: %u, session_id: 0x%llx\n", ctrl_status->status, destroy_session->session_id); - return -EINVAL; + err = -EINVAL; + goto out; } err = 0;