[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] scsi-disk: introduce check_lba_range
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 3/7] scsi-disk: introduce check_lba_range |
Date: |
Fri, 21 Sep 2012 16:52:45 +0200 |
Abstract the test for an out-of-range (starting block, block count)
pair.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-disk.c | 24 ++++++++++++++++--------
1 file modificato, 16 inserzioni(+), 8 rimozioni(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 1585683..3959603 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1449,6 +1449,18 @@ invalid_field:
return;
}
+static inline bool check_lba_range(SCSIDiskState *s,
+ uint64_t sector_num, uint32_t nb_sectors)
+{
+ /*
+ * The first line tests that no overflow happens when computing the last
+ * sector. The second line tests that the last accessed sector is in
+ * range.
+ */
+ return (sector_num <= sector_num + nb_sectors &&
+ sector_num + nb_sectors - 1 <= s->qdev.max_lba);
+}
+
typedef struct UnmapCBData {
SCSIDiskReq *r;
uint8_t *inbuf;
@@ -1473,8 +1485,7 @@ static void scsi_unmap_complete(void *opaque, int ret)
if (data->count > 0 && !r->req.io_canceled) {
sector_num = ldq_be_p(&data->inbuf[0]);
nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL;
- if (sector_num > sector_num + nb_sectors ||
- sector_num + nb_sectors - 1 > s->qdev.max_lba) {
+ if (!check_lba_range(s, sector_num, nb_sectors)) {
scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
goto done;
}
@@ -1802,8 +1813,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest
*req, uint8_t *buf)
scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
return 0;
}
- if (r->req.cmd.lba > r->req.cmd.lba + nb_sectors ||
- r->req.cmd.lba + nb_sectors - 1 > s->qdev.max_lba) {
+ if (!check_lba_range(s, r->req.cmd.lba, nb_sectors)) {
goto illegal_lba;
}
@@ -1878,8 +1888,7 @@ 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 > r->req.cmd.lba + len ||
- r->req.cmd.lba + len - 1 > s->qdev.max_lba) {
+ if (!check_lba_range(s, r->req.cmd.lba, len)) {
goto illegal_lba;
}
r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512);
@@ -1907,8 +1916,7 @@ 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 > r->req.cmd.lba + len ||
- r->req.cmd.lba + len - 1 > s->qdev.max_lba) {
+ if (!check_lba_range(s, r->req.cmd.lba, len)) {
goto illegal_lba;
}
r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512);
--
1.7.12
- [Qemu-devel] [PULL 0/7] SCSI patches for 2012-09-21, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 2/7] iSCSI: We dont need to explicitely call qemu_notify_event() any more, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 3/7] scsi-disk: introduce check_lba_range,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 4/7] scsi-disk: fix check for out-of-range LBA, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 1/7] iSCSI: We need to support SG_IO also from iscsi_ioctl(), Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 6/7] scsi-disk: use scsi_data_cdb_length, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 5/7] scsi: introduce scsi_cdb_length and scsi_data_cdb_length, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 7/7] SCSI: Standard INQUIRY data should report HiSup flag as set., Paolo Bonzini, 2012/09/21
- Re: [Qemu-devel] [PULL 0/7] SCSI patches for 2012-09-21, Anthony Liguori, 2012/09/25