Skip to contentSkip to conversation

libata: Don't believe bogus claims in the older PIO mode register

PATCH Applied Alan Cox 2 participants 2 messages Sep 29, 2006 – Oct 5, 2006 libata

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 libata: Don't believe bogus claims in the older PIO mode register

drivers/ata/libata-core.c +5 -1
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.18-mm2/drivers/ata/libata-core.c linux-2.6.18-mm2/drivers/ata/libata-core.c
@@ -870,7 +870,11 @@
 		 * the PIO timing number for the maximum. Turn it into
 		 * a mask.
 		 */
-		pio_mask = (2 << (id[ATA_ID_OLD_PIO_MODES] & 0xFF)) - 1 ;
+		u8 mode = id[ATA_ID_OLD_PIO_MODES] & 0xFF;
+		if( mode < 5)	/* Valid PIO range */
+                	pio_mask = (2 << mode) - 1 ;
+		else
+			pio_mask = 1;
 
 		/* But wait.. there's more. Design your standards by
 		 * committee and you too can get a free iordy field to
Applied
#1 lore raw
Quoted 6 lines · Alan Cox

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.18-mm2/drivers/ata/libata-core.c linux-2.6.18-mm2/drivers/ata/libata-core.c

drivers/ata/libata-core.c line 877

Quoted 9 lines
drivers/ata/libata-core.c +5 -1
@@ -870,7 +870,11 @@
 		 * the PIO timing number for the maximum. Turn it into
 		 * a mask.
 		 */
-		pio_mask = (2 << (id[ATA_ID_OLD_PIO_MODES] & 0xFF)) - 1 ;
+		u8 mode = id[ATA_ID_OLD_PIO_MODES] & 0xFF;
+		if( mode < 5)	/* Valid PIO range */
+                	pio_mask = (2 << mode) - 1 ;
+		else
+			pio_mask = 1;

applied to #upstream-fixes, after fixing up stuff like "if( "