The pending state (s->dataset.filename, s->data_out, s->write_pending) was only partially released when a transaction was canceled, the session closed, the device reset, or the write failed. This left dangling pointers and leaked memory.
Free and clear these fields consistently on all those paths, and route the early error in usb_mtp_write_data() through the common cleanup. Cc: [email protected] Fixes: 53735bef108c ("usb-mtp: Advertise SendObjectInfo for write support") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4529 Suggested-by: Hui Peng <https://gitlab.com/benquike> Signed-off-by: Tommaso Califano <[email protected]> --- hw/usb/dev-mtp.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index bc5a6f0891..1c14770a9c 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1236,6 +1236,13 @@ static void usb_mtp_object_delete(MTPState *s, uint32_t handle, } } +static void usb_mtp_reset_pending_write(MTPState *s) { + g_free(s->dataset.filename); + s->dataset.filename = NULL; + s->write_pending = false; + s->dataset.size = 0; +} + static void usb_mtp_command(MTPState *s, MTPControl *c) { MTPData *data_in = NULL; @@ -1282,6 +1289,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c) trace_usb_mtp_op_close_session(s->dev.addr); s->session = 0; s->next_handle = 0; + usb_mtp_reset_pending_write(s); usb_mtp_file_monitor_cleanup(s); usb_mtp_object_free(s, QTAILQ_FIRST(&s->objects)); assert(QTAILQ_EMPTY(&s->objects)); @@ -1504,6 +1512,7 @@ static void usb_mtp_handle_reset(USBDevice *dev) s->data_out = NULL; g_free(s->result); s->result = NULL; + usb_mtp_reset_pending_write(s); } static void usb_mtp_handle_control(USBDevice *dev, USBPacket *p, @@ -1522,9 +1531,7 @@ static void usb_mtp_handle_control(USBDevice *dev, USBPacket *p, usb_mtp_data_free(s->data_in); s->data_in = NULL; if (s->write_pending) { - g_free(s->dataset.filename); - s->write_pending = false; - s->dataset.size = 0; + usb_mtp_reset_pending_write(s); } usb_mtp_data_free(s->data_out); s->data_out = NULL; @@ -1614,7 +1621,7 @@ static void usb_mtp_write_data(MTPState *s, uint32_t handle) if (!parent || !s->write_pending) { usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans, 0, 0, 0, 0); - return; + goto close; } if (s->dataset.filename) { @@ -1691,10 +1698,10 @@ close: close(d->fd); d->fd = -1; } - g_free(s->dataset.filename); - s->dataset.size = 0; + usb_mtp_data_free(s->data_out); + s->data_out = NULL; + usb_mtp_reset_pending_write(s); g_free(path); - s->write_pending = false; } static void usb_mtp_write_metadata(MTPState *s) @@ -1740,6 +1747,7 @@ static void usb_mtp_write_metadata(MTPState *s) next_handle = o->handle; } + g_free(s->dataset.filename); s->dataset.filename = filename; s->dataset.format = dataset->format; s->dataset.size = dataset->size; -- 2.56.0
