From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50070 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQfeT-0001dq-15 for qemu-devel@nongnu.org; Thu, 09 Dec 2010 07:31:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQfeN-0005NG-Pq for qemu-devel@nongnu.org; Thu, 09 Dec 2010 07:31:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQfeN-0005N1-HH for qemu-devel@nongnu.org; Thu, 09 Dec 2010 07:31:07 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB9CV6ko027070 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 9 Dec 2010 07:31:06 -0500 From: Gerd Hoffmann Date: Thu, 9 Dec 2010 13:30:27 +0100 Message-Id: <1291897827-11424-25-git-send-email-kraxel@redhat.com> In-Reply-To: <1291897827-11424-1-git-send-email-kraxel@redhat.com> References: <1291897827-11424-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 24/24] usb storage: fix status reporting List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Change usb_msd_send_status() to take a pointer to the status packet instead of writing the status to s->usb_buf which might not point to the correct location. Signed-off-by: Gerd Hoffmann --- hw/usb-msd.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 7b8189f..28c12dd 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -196,15 +196,18 @@ static void usb_msd_copy_data(MSDState *s) } } -static void usb_msd_send_status(MSDState *s) +static void usb_msd_send_status(MSDState *s, USBPacket *p) { struct usb_msd_csw csw; + int len; csw.sig = cpu_to_le32(0x53425355); csw.tag = cpu_to_le32(s->tag); csw.residue = s->residue; csw.status = s->result; - memcpy(s->usb_buf, &csw, 13); + + len = MIN(sizeof(csw), p->len); + memcpy(p->data, &csw, len); } static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag, @@ -224,7 +227,7 @@ static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag, if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) { /* A deferred packet with no write data remaining must be the status read packet. */ - usb_msd_send_status(s); + usb_msd_send_status(s, p); s->mode = USB_MSDM_CBW; } else { if (s->data_len) { @@ -425,9 +428,7 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p) if (len < 13) goto fail; - s->usb_len = len; - s->usb_buf = data; - usb_msd_send_status(s); + usb_msd_send_status(s, p); s->mode = USB_MSDM_CBW; ret = 13; break; -- 1.7.1