When SendObjectInfo fails its checks, usb_mtp_command() queues an error response and then falls through. It still allocates s->data_out. The data phase is then dropped because a result is pending, so s->data_out is never released.
Return right after queueing the error response. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index d01b38aeac..82970b6437 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1401,14 +1401,17 @@ static void usb_mtp_command(MTPState *s, MTPControl *c) if (!FLAG_SET(s, MTP_FLAG_WRITABLE)) { usb_mtp_queue_result(s, RES_STORE_READ_ONLY, c->trans, 0, 0, 0, 0); + return; } else if (c->argv[0] && (c->argv[0] != QEMU_STORAGE_ID)) { /* First parameter points to storage id or is 0 */ usb_mtp_queue_result(s, RES_STORE_NOT_AVAILABLE, c->trans, 0, 0, 0, 0); + return; } else if (c->argv[1] && !c->argv[0]) { /* If second parameter is specified, first must also be specified */ usb_mtp_queue_result(s, RES_DESTINATION_UNSUPPORTED, c->trans, 0, 0, 0, 0); + return; } else { uint32_t handle = c->argv[1]; if (handle == 0xFFFFFFFF || handle == 0) { @@ -1420,9 +1423,11 @@ static void usb_mtp_command(MTPState *s, MTPControl *c) if (o == NULL) { usb_mtp_queue_result(s, RES_INVALID_OBJECT_HANDLE, c->trans, 0, 0, 0, 0); + return; } else if (o->format != FMT_ASSOCIATION) { usb_mtp_queue_result(s, RES_INVALID_PARENT_OBJECT, c->trans, 0, 0, 0, 0); + return; } } if (o) { -- 2.56.0
