[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/32] scsi-disk: improve the lba-out-of-range tests
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 19/32] scsi-disk: improve the lba-out-of-range tests for read/write/verify |
Date: |
Fri, 27 Jul 2012 17:02:46 +0200 |
From: Ronnie Sahlberg <address@hidden>
Improve the tests for the LBA to cover more cases.
For the 16 byte opcodes, the lba is a uint64, so we need to check is to
make sure that we do not wrap. For example if an opcode would specify
the LBA:0xffffffffffffffff and LEN:2 then lba+len would wrap to 1.
Also verify that ALL requested blocks are available, not just the first one.
Signed-off-by: Ronnie Sahlberg <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-disk.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 526da4b..3c03159 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1777,7 +1777,8 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req,
uint8_t *buf)
if (r->req.cmd.buf[1] & 0xe0) {
goto illegal_request;
}
- if (r->req.cmd.lba > s->qdev.max_lba) {
+ if (r->req.cmd.lba > r->req.cmd.lba + len ||
+ r->req.cmd.lba + len - 1 > s->qdev.max_lba) {
goto illegal_lba;
}
r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512);
@@ -1800,7 +1801,8 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req,
uint8_t *buf)
if (r->req.cmd.buf[1] & 0xe0) {
goto illegal_request;
}
- if (r->req.cmd.lba > s->qdev.max_lba) {
+ if (r->req.cmd.lba > r->req.cmd.lba + len ||
+ r->req.cmd.lba + len - 1 > s->qdev.max_lba) {
goto illegal_lba;
}
r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512);
--
1.7.10.4
- [Qemu-devel] [PATCH 30/32] virtio-scsi: report parameter change events, (continued)
- [Qemu-devel] [PATCH 30/32] virtio-scsi: report parameter change events, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 29/32] virtio-scsi: do not report dropped events after reset, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 31/32] virtio-scsi: add ioeventfd support, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 32/32] virtio-scsi: enable MSI-X support, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 15/32] scsi-disk: fix changeable values for MODE_PAGE_R_W_ERROR, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 18/32] scsi-disk: rd/wr/vr-protect !=0 is an error, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 21/32] scsi-disk: removable hard disks support load/eject, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 28/32] virtio-scsi: Report missed events, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 27/32] virtio-scsi: Implement hotplug support for virtio-scsi, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 16/32] scsi-disk: parse MODE SELECT commands and parameters, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 19/32] scsi-disk: improve the lba-out-of-range tests for read/write/verify,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 26/32] scsi: report parameter changes to HBA drivers, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 22/32] scsi: add tracepoint for scsi_req_cancel, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 20/32] scsi-disk: Fail medium writes with proper sense for readonly LUNs, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 12/32] scsi-disk: separate read_data/write_data implementation for emulate_reqops, Paolo Bonzini, 2012/07/27