diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-09-05 17:54:36 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-10-11 21:44:19 -0500 |
| commit | ff498e4a0dc188d2a441af6111065dd55feab57b (patch) | |
| tree | 3d9b29fa6b6a4be6e6ec30e0e256f5f4e9efab63 | |
| parent | 394a2f28cb186a4c421a358204387da58d1ee7a1 (diff) | |
scsi-disk: fix check for out-of-range LBA
This fix is needed to correctly handle 0-block read and writes.
Without it, a 0-block access at LBA 0 would underflow.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 12ca76fc48081b3a0ad1a70546abfcf198aedfc4)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/scsi-disk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 3959603b0f..d621852857 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1456,9 +1456,13 @@ static inline bool check_lba_range(SCSIDiskState *s, * 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. + * + * Careful, the computations should not underflow for nb_sectors == 0, + * and a 0-block read to the first LBA beyond the end of device is + * valid. */ return (sector_num <= sector_num + nb_sectors && - sector_num + nb_sectors - 1 <= s->qdev.max_lba); + sector_num + nb_sectors <= s->qdev.max_lba + 1); } typedef struct UnmapCBData { |