* [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe()
@ 2022-04-18 9:31 Hangyu Hua
2022-04-22 15:29 ` Arnaud POULIQUEN
2022-04-25 16:55 ` Mathieu Poirier
0 siblings, 2 replies; 4+ messages in thread
From: Hangyu Hua @ 2022-04-18 9:31 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, arnaud.pouliquen
Cc: linux-remoteproc, linux-kernel, Hangyu Hua
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@gmail.com>
---
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:
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe()
2022-04-18 9:31 [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe() Hangyu Hua
@ 2022-04-22 15:29 ` Arnaud POULIQUEN
2022-04-25 16:55 ` Mathieu Poirier
1 sibling, 0 replies; 4+ messages in thread
From: Arnaud POULIQUEN @ 2022-04-22 15:29 UTC (permalink / raw)
To: Hangyu Hua, bjorn.andersson, mathieu.poirier
Cc: linux-remoteproc, linux-kernel
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@gmail.com>
Tested-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
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:
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe()
2022-04-18 9:31 [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe() Hangyu Hua
2022-04-22 15:29 ` Arnaud POULIQUEN
@ 2022-04-25 16:55 ` Mathieu Poirier
2022-04-26 1:40 ` Hangyu Hua
1 sibling, 1 reply; 4+ messages in thread
From: Mathieu Poirier @ 2022-04-25 16:55 UTC (permalink / raw)
To: Hangyu Hua
Cc: bjorn.andersson, arnaud.pouliquen, linux-remoteproc, linux-kernel
On Mon, Apr 18, 2022 at 05:31:44PM +0800, 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@gmail.com>
> ---
> 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;
Please add a comment that highlights where 'vch' will be free'd to avoid
receiving patches that will introduce another kfree(). Same for your other
patch.
In the next revision please use a cover letter and add Arnaud's patches to it.
Thanks,
Mathieu
> + 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:
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe()
2022-04-25 16:55 ` Mathieu Poirier
@ 2022-04-26 1:40 ` Hangyu Hua
0 siblings, 0 replies; 4+ messages in thread
From: Hangyu Hua @ 2022-04-26 1:40 UTC (permalink / raw)
To: Mathieu Poirier
Cc: bjorn.andersson, arnaud.pouliquen, linux-remoteproc, linux-kernel
On 2022/4/26 00:55, Mathieu Poirier wrote:
> On Mon, Apr 18, 2022 at 05:31:44PM +0800, 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@gmail.com>
>> ---
>> 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;
>
> Please add a comment that highlights where 'vch' will be free'd to avoid
> receiving patches that will introduce another kfree(). Same for your other
> patch.
>
> In the next revision please use a cover letter and add Arnaud's patches to it.
>
> Thanks,
> Mathieu
>
Thanks! I will send a v2 later.
>> + 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:
>> --
>> 2.25.1
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-26 1:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-18 9:31 [PATCH] rpmsg: virtio: fix possible double free in rpmsg_probe() Hangyu Hua
2022-04-22 15:29 ` Arnaud POULIQUEN
2022-04-25 16:55 ` Mathieu Poirier
2022-04-26 1:40 ` Hangyu Hua
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox