From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv3ou-0003HZ-Oi for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:09:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wv3ol-00021A-KO for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:09:28 -0400 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:57876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv3ol-000212-DI for qemu-devel@nongnu.org; Thu, 12 Jun 2014 08:09:19 -0400 Received: by mail-wi0-f175.google.com with SMTP id r20so1498928wiv.14 for ; Thu, 12 Jun 2014 05:09:18 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 12 Jun 2014 14:09:04 +0200 Message-Id: <1402574948-11203-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1402574948-11203-1-git-send-email-pbonzini@redhat.com> References: <1402574948-11203-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 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: famz@redhat.com, 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 e548ad3..c32c99b 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[0], 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.9.3