From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwYfi-0006sA-TQ for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwYfY-0002cN-WA for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:10 -0400 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]:56222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwYfY-0002by-Pq for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:00 -0400 Received: by mail-wg0-f47.google.com with SMTP id k14so5673808wgh.18 for ; Mon, 16 Jun 2014 08:18:00 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 16 Jun 2014 17:17:46 +0200 Message-Id: <1402931870-17261-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1402931870-17261-1-git-send-email-pbonzini@redhat.com> References: <1402931870-17261-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/7] virtio-scsi: add target swap for VirtIOSCSICtrlTMFReq fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index f013e35..ec9a536 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -207,6 +207,7 @@ static void virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req) /* Here VIRTIO_SCSI_S_OK means "FUNCTION COMPLETE". */ req->resp.tmf->response = VIRTIO_SCSI_S_OK; + tswap32s(&req->req.tmf->subtype); switch (req->req.tmf->subtype) { case VIRTIO_SCSI_T_TMF_ABORT_TASK: case VIRTIO_SCSI_T_TMF_QUERY_TASK: @@ -314,8 +315,11 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) if (iov_to_buf(req->elem.out_sg, req->elem.out_num, 0, &type, sizeof(type)) < sizeof(type)) { virtio_scsi_bad_req(); + continue; + } - } else if (req->req.tmf->type == VIRTIO_SCSI_T_TMF) { + tswap32s(&req->req.tmf->type); + if (req->req.tmf->type == VIRTIO_SCSI_T_TMF) { if (virtio_scsi_parse_req(req, sizeof(VirtIOSCSICtrlTMFReq), sizeof(VirtIOSCSICtrlTMFResp)) < 0) { virtio_scsi_bad_req(); -- 1.8.3.1