rpmsg: fix possible refcount leak in rpmsg_register_device_override()
PATCH 1/1 rpmsg: fix possible refcount leak in rpmsg_register_device_override()
[1] commit 1680939e9ecf ("rpmsg: virtio: Fix possible double free in rpmsg_virtio_add_ctrl_dev()")
[2] commit c2eecefec5df ("rpmsg: virtio: Fix possible double free in rpmsg_probe()")
[3] commit bb17d110cbf2 ("rpmsg: Fix calling device_lock() on non-initialized device")
The above three patches merged at the same time introduced a new bug.
[1] and [2] make rpmsg_ns_register_device and rpmsg_ctrldev_register_device need to call the callback function internally to free vch when it fails.
[3] has an error return path not handled vch.
Fix this by adding a put_device() to the error path.
--- drivers/rpmsg/rpmsg_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/rpmsg/rpmsg_core.c +1 -0
@@ -618,6 +618,7 @@ int rpmsg_register_device_override(struct rpmsg_device *rpdev, strlen(driver_override));if (ret) {dev_err (dev,"device_set_override failed: %d\n" , ret); +put_device (dev);return ret; } }
Signature · 1 line
2.25.1
Quoted 6 lines · Hangyu Hua
[1] commit
1680939e9ecf("rpmsg: virtio: Fix possible double free inrpmsg_virtio_add_ctrl_dev()")
[2] commitc2eecefec5df("rpmsg: virtio: Fix possible double free inrpmsg_probe()")
[3] commitbb17d110cbf2("rpmsg: Fix callingdevice_lock()on non-initialized device")
I think only the last [3] introduced it, because it's the commit missing put_device in first error path.
Quoted 10 lines
The above three patches merged at the same time introduced a new bug.
[1] and [2] makerpmsg_ns_register_deviceandrpmsg_ctrldev_register_deviceneed to call the callback function internally to free vch when it fails.
[3] has an error return path not handled vch.Fix this by adding a
put_device()to the error path.Fixes bb17d110cbf2 ("rpmsg: Fix calling device_lock() on non-initialized device")Signed-off-by Hangyu Hua <[email protected]>
Best regards,
Krzysztof
Quoted 11 lines · Krzysztof Kozlowski
Quoted 6 lines · Hangyu Hua
[1] commit
1680939e9ecf("rpmsg: virtio: Fix possible double free inrpmsg_virtio_add_ctrl_dev()")
[2] commitc2eecefec5df("rpmsg: virtio: Fix possible double free inrpmsg_probe()")
[3] commitbb17d110cbf2("rpmsg: Fix callingdevice_lock()on non-initialized device")I think only the last [3] introduced it, because it's the commit missing
put_devicein first error path.
I see. Do i need to change the commit log and then send a v2?
Quoted 16 lines
Quoted 10 lines
The above three patches merged at the same time introduced a new bug.
[1] and [2] makerpmsg_ns_register_deviceandrpmsg_ctrldev_register_deviceneed to call the callback function internally to free vch when it fails.
[3] has an error return path not handled vch.Fix this by adding a
put_device()to the error path.Fixes bb17d110cbf2 ("rpmsg: Fix calling device_lock() on non-initialized device")Signed-off-by Hangyu Hua <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>Best regards,
Krzysztof
Quoted 9 lines · Hangyu Hua
Quoted 8 lines · Krzysztof Kozlowski
Quoted 6 lines · Hangyu Hua
[1] commit
1680939e9ecf("rpmsg: virtio: Fix possible double free inrpmsg_virtio_add_ctrl_dev()")
[2] commitc2eecefec5df("rpmsg: virtio: Fix possible double free inrpmsg_probe()")
[3] commitbb17d110cbf2("rpmsg: Fix callingdevice_lock()on non-initialized device")
Quoted 5 lines
Quoted 3 lines
I think only the last [3] introduced it, because it's the commit missing
put_devicein first error path.I see. Do i need to change the commit log and then send a v2?
Yes, please. With my Reviewed-by tag.
Best regards,
Krzysztof