| Message ID | 20161014142000.18833-1-dvlasenk@redhat.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 2588b8f..e7a7838 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -380,9 +380,10 @@ ahd_delay(long usec) * multi-millisecond waits. Wait at most * 1024us per call. */ - while (usec > 0) { - udelay(usec % 1024); - usec -= 1024; + udelay(usec & 1023); + usec >>= 10; + while (--usec >= 0) { + udelay(1024); } } diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index fc6a831..c81798e 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -388,9 +388,10 @@ ahc_delay(long usec) * multi-millisecond waits. Wait at most * 1024us per call. */ - while (usec > 0) { - udelay(usec % 1024); - usec -= 1024; + udelay(usec & 1023); + usec >>= 10; + while (--usec >= 0) { + udelay(1024); } }
They are buggy: while (usec > 0) udelay(usec % 1024); usec -= 1024; For example, for usec = 100*1024 + 1, old code will udelay(1) 101 times, i.e. it will be approximately equivalent to udelay(101), not the expected udelay(102400). This did not bite because all callers use values far from "pathological" ones, such as 500 and 1000 - these work fine with buggy code. This was reported in 2006 but was missed. Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> CC: James Bottomley <JBottomley@Parallels.com> CC: Hannes Reinicke <hare@suse.de> CC: linux-scsi@vger.kernel.org CC: linux-kernel@vger.kernel.org --- drivers/scsi/aic7xxx/aic79xx_osm.c | 7 ++++--- drivers/scsi/aic7xxx/aic7xxx_osm.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-)