Skip to content

Commit

Permalink
scsi-disk: fix check for out-of-range LBA
Browse files Browse the repository at this point in the history
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 12ca76f)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
bonzini authored and mdroth committed Oct 12, 2012
1 parent 394a2f2 commit ff498e4
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion hw/scsi-disk.c
Expand Up @@ -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 {
Expand Down

0 comments on commit ff498e4

Please sign in to comment.