Received: from [140.186.70.92] (port=48139 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKTOe-0002CD-HU for qemu-devel@nongnu.org; Mon, 22 Nov 2010 05:13:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKTON-0001AN-8T for qemu-devel@nongnu.org; Mon, 22 Nov 2010 05:13:16 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58168 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKTOM-00019l-Fx for qemu-devel@nongnu.org; Mon, 22 Nov 2010 05:12:58 -0500 Date: Mon, 22 Nov 2010 11:15:35 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20101122101536.4DE10F90AD@ochil.suse.de> From: hare@suse.de (Hannes Reinecke) Subject: [Qemu-devel] [PATCH] scsi-disk: add data direction checking List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, nab@linux-iscsi.org, kraxel@redhat.com scsi_req_parse() already provides for a data direction setting, so we should be using it to check for correct direction. Signed-off-by: Hannes Reinecke --- hw/scsi-disk.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a0dda88..82072a8 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -52,8 +52,6 @@ typedef struct SCSIDiskState SCSIDiskState; typedef struct SCSIDiskReq { SCSIRequest req; - /* ??? We should probably keep track of whether the data transfer is - a read or a write. Currently we rely on the host getting it right. */ /* Both sector and sector_count are in terms of qemu 512 byte blocks. */ uint64_t sector; uint32_t sector_count; @@ -172,6 +170,9 @@ static void scsi_read_data(SCSIRequest *req) /* No data transfer may already be in progress */ assert(r->req.aiocb == NULL); + if (r->req.cmd.mode == SCSI_XFER_TO_DEV) + BADF("Data transfer direction invalid\n"); + if (r->sector_count == (uint32_t)-1) { DPRINTF("Read buf_len=%zd\n", r->iov[0].iov_len); r->sector_count = 0; @@ -284,6 +285,9 @@ static int scsi_write_data(SCSIRequest *req) /* No data transfer may already be in progress */ assert(r->req.aiocb == NULL); + if (r->req.cmd.mode != SCSI_XFER_TO_DEV) + BADF("Data transfer direction invalid\n"); + n = iov_size(r->iov, r->iov_num) / 512; if (n) { qemu_iovec_init_external(&r->qiov, r->iov, r->iov_num); @@ -970,11 +974,9 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); ssize_t len = 0; - int is_write; uint8_t command; command = buf[0]; - is_write = 0; DPRINTF("Command: lun=%d tag=0x%x data=0x%02x", lun, tag, buf[0]); if (scsi_req_parse(&r->req, buf) != 0) { @@ -1057,7 +1059,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) goto illegal_lba; } r->sector = r->req.cmd.lba * s->cluster_size; - is_write = 1; break; case MODE_SELECT: DPRINTF("Mode Select(6) (len %lu)\n", (long)r->req.cmd.xfer); @@ -1098,7 +1099,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) scsi_command_complete(r, GOOD, SENSE_CODE(NO_SENSE)); } len += r->sector_count * 512; - if (is_write) { + if (r->req.cmd.mode == SCSI_XFER_TO_DEV) { return -len; } else { if (!r->sector_count) -- 1.6.0.2