]> err.no Git - linux-2.6/commitdiff
ide: Fix an overrun found in the CS5535 IDE driver
authorJordan Crouse <jordan.crouse@amd.com>
Wed, 1 Aug 2007 21:46:42 +0000 (23:46 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 1 Aug 2007 21:46:42 +0000 (23:46 +0200)
As found by the Coverity checker, and reported by Adrian Bunk, this
fixes a overrun error in the CS5535 IDE driver.  Somebody got a little
excited with the if() statement - the CS5535 only supports UDMA 0-4.

Bart:
Not a bug per se since the upper layer will never feed this function
with speed > XFER_UDMA_4 (thanks to ->ultra_mask being set to 0x1f).

Worth fixing anyway.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/pci/cs5535.c

index ce44e38390aa9e8bec5232ba1f9304f191dc6c07..9bd526db03cf3049500cd8964b65f3e49063d2c2 100644 (file)
@@ -116,7 +116,7 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed)
 
                reg &= 0x80000000UL;  /* Preserve the PIO format bit */
 
-               if (speed >= XFER_UDMA_0 && speed <= XFER_UDMA_7)
+               if (speed >= XFER_UDMA_0 && speed <= XFER_UDMA_4)
                        reg |= cs5535_udma_timings[speed - XFER_UDMA_0];
                else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2)
                        reg |= cs5535_mwdma_timings[speed - XFER_MW_DMA_0];