The end of a SendObject data phase was detected by a short packet, assuming a 64-byte max packet size. That only holds for full speed: on high and super speed endpoints, transfers ending on a 64-byte boundary were misdetected.
Use the endpoint's max_packet_size. Also end the transfer as soon as the size declared in ObjectInfo has been received, and fail it with RES_INCOMPLETE_TRANSFER if a short packet arrives before that. Cc: [email protected] Fixes: 3e096650a64d ("dev-mtp: Add support for > 4GB file transfers") 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, 21 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 6fd92e5a68..82de3ee401 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1845,7 +1845,27 @@ static void usb_mtp_get_data(MTPState *s, mtp_container *container, usb_packet_copy(p, d->data + d->data_offset, dlen); d->offset += dlen; d->data_offset += dlen; - if ((p->iov.size % 64) || !p->iov.size) { + /* + * The transfer ends on: + * - A short packet + * - A Zero Length Packet + * - When the declared size has been received. + * A size of 0xFFFFFFFF means the object is >= 4GiB and its real size + * is unknown, so it can be neither used to detect the end nor checked + * against the received length. + */ + if ((p->iov.size % p->ep->max_packet_size) || !p->iov.size || + (s->dataset.size != 0xFFFFFFFF && s->dataset.size == d->offset)) { + /* Size is known (< 4GiB) but received data doesn't match it */ + if (s->dataset.size != 0xFFFFFFFF && + s->dataset.size != d->offset) { + usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans, + 0, 0, 0, 0); + usb_mtp_data_free(s->data_out); + s->data_out = NULL; + usb_mtp_reset_pending_write(s); + return; + } if (d->length == MTP_WRITE_BUF_SZ) { d->write_status = WRITE_END; } else { -- 2.56.0
