mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 18:09:56 +00:00
Drivers: hv: vmbus: fix double free in the error path of vmbus_add_channel_work()
[ Upstream commitf92a4b50f0] In the error path of vmbus_device_register(), device_unregister() is called, which calls vmbus_device_release(). The latter frees the struct hv_device that was passed in to vmbus_device_register(). So remove the kfree() in vmbus_add_channel_work() to avoid a double free. Fixes:c2e5df616e("vmbus: add per-channel sysfs info") Suggested-by: Michael Kelley <mikelley@microsoft.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Michael Kelley <mikelley@microsoft.com> Link: https://lore.kernel.org/r/20221119081135.1564691-2-yangyingliang@huawei.com Signed-off-by: Wei Liu <wei.liu@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
1e557e6e2d
commit
ab335de096
@@ -533,13 +533,17 @@ static void vmbus_add_channel_work(struct work_struct *work)
|
|||||||
* Add the new device to the bus. This will kick off device-driver
|
* Add the new device to the bus. This will kick off device-driver
|
||||||
* binding which eventually invokes the device driver's AddDevice()
|
* binding which eventually invokes the device driver's AddDevice()
|
||||||
* method.
|
* method.
|
||||||
|
*
|
||||||
|
* If vmbus_device_register() fails, the 'device_obj' is freed in
|
||||||
|
* vmbus_device_release() as called by device_unregister() in the
|
||||||
|
* error path of vmbus_device_register(). In the outside error
|
||||||
|
* path, there's no need to free it.
|
||||||
*/
|
*/
|
||||||
ret = vmbus_device_register(newchannel->device_obj);
|
ret = vmbus_device_register(newchannel->device_obj);
|
||||||
|
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
pr_err("unable to add child device object (relid %d)\n",
|
pr_err("unable to add child device object (relid %d)\n",
|
||||||
newchannel->offermsg.child_relid);
|
newchannel->offermsg.child_relid);
|
||||||
kfree(newchannel->device_obj);
|
|
||||||
goto err_deq_chan;
|
goto err_deq_chan;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user