* [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session()
@ 2022-05-22 13:07 Christophe JAILLET
2022-05-23 0:00 ` zhenwei pi
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christophe JAILLET @ 2022-05-22 13:07 UTC (permalink / raw)
To: dan.carpenter, Gonglei, Michael S. Tsirkin, Jason Wang,
Herbert Xu, David S. Miller, zhenwei pi
Cc: linux-kernel, kernel-janitors, Christophe JAILLET,
virtualization, linux-crypto
Now that a private buffer is allocated (see commit in the Fixes tag),
it must be released in all error handling paths.
Add the missing goto to avoid a leak in the error handling path.
Fixes: 42e6ac99e417 ("virtio-crypto: use private buffer for control request")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session()
2022-05-22 13:07 [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session() Christophe JAILLET
@ 2022-05-23 0:00 ` zhenwei pi
2022-05-23 3:30 ` Gonglei (Arei)
2022-05-24 6:32 ` Jason Wang
2 siblings, 0 replies; 4+ messages in thread
From: zhenwei pi @ 2022-05-23 0:00 UTC (permalink / raw)
To: Christophe JAILLET, Michael S. Tsirkin, Gonglei
Cc: linux-kernel, dan.carpenter, Jason Wang, kernel-janitors,
virtualization, linux-crypto, David S. Miller, Herbert Xu
On 5/22/22 21:07, Christophe JAILLET wrote:
> Now that a private buffer is allocated (see commit in the Fixes tag),
> it must be released in all error handling paths.
>
> Add the missing goto to avoid a leak in the error handling path.
>
> Fixes: 42e6ac99e417 ("virtio-crypto: use private buffer for control request")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> 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;
This looks good to me, thanks!
Acked-by: zhenwei pi <pizhenwei@bytedance.com>
--
zhenwei pi
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session()
2022-05-22 13:07 [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session() Christophe JAILLET
2022-05-23 0:00 ` zhenwei pi
@ 2022-05-23 3:30 ` Gonglei (Arei)
2022-05-24 6:32 ` Jason Wang
2 siblings, 0 replies; 4+ messages in thread
From: Gonglei (Arei) @ 2022-05-23 3:30 UTC (permalink / raw)
To: Christophe JAILLET, dan.carpenter, Michael S. Tsirkin,
Jason Wang, Herbert Xu, David S. Miller, zhenwei pi
Cc: linux-kernel, kernel-janitors, virtualization, linux-crypto
> -----Original Message-----
> From: Christophe JAILLET [mailto:christophe.jaillet@wanadoo.fr]
> Sent: Sunday, May 22, 2022 9:07 PM
> To: dan.carpenter@oracle.com; Gonglei (Arei) <arei.gonglei@huawei.com>;
> Michael S. Tsirkin <mst@redhat.com>; Jason Wang <jasowang@redhat.com>;
> Herbert Xu <herbert@gondor.apana.org.au>; David S. Miller
> <davem@davemloft.net>; zhenwei pi <pizhenwei@bytedance.com>
> Cc: linux-kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Christophe
> JAILLET <christophe.jaillet@wanadoo.fr>;
> virtualization@lists.linux-foundation.org; linux-crypto@vger.kernel.org
> Subject: [PATCH] virtio-crypto: Fix an error handling path in
> virtio_crypto_alg_skcipher_close_session()
>
> Now that a private buffer is allocated (see commit in the Fixes tag), it must be
> released in all error handling paths.
>
> Add the missing goto to avoid a leak in the error handling path.
>
> Fixes: 42e6ac99e417 ("virtio-crypto: use private buffer for control request")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/crypto/virtio/virtio_crypto_skcipher_algs.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Regards,
-Gonglei
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session()
2022-05-22 13:07 [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session() Christophe JAILLET
2022-05-23 0:00 ` zhenwei pi
2022-05-23 3:30 ` Gonglei (Arei)
@ 2022-05-24 6:32 ` Jason Wang
2 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2022-05-24 6:32 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Dan Carpenter, Gonglei, Michael S. Tsirkin, Herbert Xu,
David S. Miller, zhenwei pi, linux-kernel, kernel-janitors,
virtualization, linux-crypto
On Sun, May 22, 2022 at 9:07 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> Now that a private buffer is allocated (see commit in the Fixes tag),
> it must be released in all error handling paths.
>
> Add the missing goto to avoid a leak in the error handling path.
>
> Fixes: 42e6ac99e417 ("virtio-crypto: use private buffer for control request")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Jason Wang <jasowang@redhat.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;
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-24 6:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-22 13:07 [PATCH] virtio-crypto: Fix an error handling path in virtio_crypto_alg_skcipher_close_session() Christophe JAILLET
2022-05-23 0:00 ` zhenwei pi
2022-05-23 3:30 ` Gonglei (Arei)
2022-05-24 6:32 ` Jason Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).