usb_mtp_handle_control() reads a 16-bit event code from the request data without checking that the host actually sent it. A request with wLength < 2 makes the device act on stale bytes left in the control buffer.
STALL requests that are too short to hold the event code. Cc: [email protected] Fixes: 47bff13cea8d ("dev-mtp: add support for canceling transaction") 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 1c14770a9c..1a26f681ce 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1525,6 +1525,10 @@ static void usb_mtp_handle_control(USBDevice *dev, USBPacket *p, switch (request) { case ClassInterfaceOutRequest | 0x64: + if (length < sizeof(*event)) { + p->status = USB_RET_STALL; + break; + } if (*event == EVT_CANCEL_TRANSACTION) { g_free(s->result); s->result = NULL; -- 2.56.0
