@@ -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 {
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> --- hw/scsi-disk.c | 6 +++++- 1 file modificato, 5 inserzioni(+). 1 rimozione(-)