This is a note to let you know that I've just added the patch titled
rpmsg: virtio: Fix possible double free in rpmsg_virtio_add_ctrl_dev()
to the 5.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rpmsg-virtio-fix-possible-double-free-in-rpmsg_virti.patch
and it can be found in the queue-5.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 0010cb92fb27dd5803f6d2908b8264b84af40663
Author: Hangyu Hua <hbh25y@xxxxxxxxx>
Date: Tue Apr 26 14:05:35 2022 +0800
rpmsg: virtio: Fix possible double free in rpmsg_virtio_add_ctrl_dev()
[ Upstream commit 1680939e9ecf7764fba8689cfb3429c2fe2bb23c ]
vch will be free in virtio_rpmsg_release_device() when
rpmsg_ctrldev_register_device() fails. There is no need to call
kfree() again.
Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")
Signed-off-by: Hangyu Hua <hbh25y@xxxxxxxxx>
Tested-by: Arnaud Pouliquen <arnaud.pouliquen@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220426060536.15594-3-hbh25y@xxxxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index d4e453062062..9948a7335b83 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -851,7 +851,7 @@ static struct rpmsg_device *rpmsg_virtio_add_ctrl_dev(struct virtio_device *vdev
err = rpmsg_ctrldev_register_device(rpdev_ctrl);
if (err) {
- kfree(vch);
+ /* vch will be free in virtio_rpmsg_release_device() */
return ERR_PTR(err);
}
