Re: [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe()

From: Arnaud POULIQUEN
Date: Fri Apr 22 2022 - 11:29:10 EST




On 4/18/22 11:31, Hangyu Hua wrote:
> vch will be free in virtio_rpmsg_release_device() when
> rpmsg_ns_register_device() fails. There is no need to call kfree() again.
>
> Fix this by changing error path from free_vch to free_ctrldev.
>
> Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")
> Signed-off-by: Hangyu Hua <hbh25y@xxxxxxxxx>

Tested-by: Arnaud Pouliquen <arnaud.pouliquen@xxxxxxxxxxx>

Thanks,
Arnaud

> ---
> drivers/rpmsg/virtio_rpmsg_bus.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
> index 3ede25b1f2e4..603233f0686e 100644
> --- a/drivers/rpmsg/virtio_rpmsg_bus.c
> +++ b/drivers/rpmsg/virtio_rpmsg_bus.c
> @@ -973,7 +973,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
>
> err = rpmsg_ns_register_device(rpdev_ns);
> if (err)
> - goto free_vch;
> + goto free_ctrldev;
> }
>
> /*
> @@ -997,8 +997,6 @@ static int rpmsg_probe(struct virtio_device *vdev)
>
> return 0;
>
> -free_vch:
> - kfree(vch);
> free_ctrldev:
> rpmsg_virtio_del_ctrl_dev(rpdev_ctrl);
> free_coherent: