scsi-disk: add data direction checking
PATCH 1/1 scsi-disk: add data direction checking
scsi_req_parse() already provides for a data direction setting, so we should be using it to check for correct direction.
--- hw/scsi-disk.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
hw/scsi-disk.c +7 -6
@@ -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)
Signature · 1 line
1.6.0.2
Quoted 11 lines · Hannes Reinecke
hw/scsi-disk.c +3
-0@@ -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;
hw/scsi-disk.c static int scsi_write_data(SCSIRequest *req) · line 293
Quoted 9 lines
hw/scsi-disk.c +3
-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);
If the guest can trigger this then there must be a SCSI response (an error?). Right now BADF() will do fprintf(stderr) and then continue executing.
Can we abort the operation?
Stefan
Quoted 26 lines · Stefan Hajnoczi
Quoted 11 lines · Hannes Reinecke
hw/scsi-disk.c +3
-0@@ -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 ;hw/scsi-disk.c static int scsi_write_data(SCSIRequest *req) · line 293
Quoted 9 lines
hw/scsi-disk.c +3
-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);If the guest can trigger this then there must be a SCSI response (an error?). Right now
BADF()will do fprintf(stderr) and then continue executing.
Quoted 2 lines
Can we abort the operation?
I've done a patch for it as per suggestion by hch. Right now we have
if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
DPRINTF("Data transfer direction invalid\n");
scsi_read_complete(r, -EINVAL);
return;
}and -EINVAL will return the sense code 'INVALID FIELD IN CDB'. Will be in the next patchset.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke zSeries & Storage [email protected] +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Markus Rex, HRB 16746 (AG Nürnberg)
Quoted 32 lines · Hannes Reinecke
Quoted 26 lines · Stefan Hajnoczi
Quoted 11 lines · Hannes Reinecke
hw/scsi-disk.c +3
-0@@ -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;hw/scsi-disk.c static int scsi_write_data(SCSIRequest *req) · line 293
Quoted 9 lines
hw/scsi-disk.c +3
-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);If the guest can trigger this then there must be a SCSI response (an error?). Right now
BADF()will do fprintf(stderr) and then continue executing.Quoted 2 lines
Can we abort the operation?
I've done a patch for it as per suggestion by hch. Right now we have
Quoted 8 lines
if (
r->req.cmd.mode==SCSI_XFER_TO_DEV) {DPRINTF("Data transfer direction invalid\n");scsi_read_complete(r, -EINVAL); return;
}and
-EINVALwill return the sense code 'INVALID FIELD IN CDB'. Will be in the next patchset.
Sounds good.
Stefan