[PATCH 2/3] ide: Fix siimage driver accessing beyond array boundary

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Benjamin Herrenschmidt
Date: Wednesday, October 17, 2007 - 5:56 pm

The siimage use an incorrect construct to access the other drive
of a pair, causing it to access beyond an array boundary on non-0
interfaces. This fixes it by using the new ide_get_paired_drive()
hepler instead.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

 drivers/ide/pci/siimage.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-work/drivers/ide/pci/siimage.c
===================================================================
--- linux-work.orig/drivers/ide/pci/siimage.c	2007-10-18 10:42:56.000000000 +1000
+++ linux-work/drivers/ide/pci/siimage.c	2007-10-18 10:43:09.000000000 +1000
@@ -180,7 +180,7 @@ static void sil_set_pio_mode(ide_drive_t
 	const u16 data_speed[]	= { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 };
 
 	ide_hwif_t *hwif	= HWIF(drive);
-	ide_drive_t *pair	= &hwif->drives[drive->dn ^ 1];
+	ide_drive_t *pair	= ide_get_paired_drive(drive);
 	u32 speedt		= 0;
 	u16 speedp		= 0;
 	unsigned long addr	= siimage_seldev(drive, 0x04);
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/3] ide: Fix use of paired device, Benjamin Herrenschmidt, (Wed Oct 17, 5:56 pm)
[PATCH 1/3] ide: Add ide_get_paired_drive() helper, Benjamin Herrenschmidt, (Wed Oct 17, 5:56 pm)
[PATCH 2/3] ide: Fix siimage driver accessing beyond array ..., Benjamin Herrenschmidt, (Wed Oct 17, 5:56 pm)
[PATCH 3/3] ide: Fix cs5535 driver accessing beyond array ..., Benjamin Herrenschmidt, (Wed Oct 17, 5:56 pm)
Re: [PATCH 0/3] ide: Fix use of paired device, Sergei Shtylyov, (Thu Oct 18, 4:54 am)
Re: [PATCH 0/3] ide: Fix use of paired device, Sergei Shtylyov, (Thu Oct 18, 4:58 am)
Re: [PATCH 1/3] ide: Add ide_get_paired_drive() helper, Sergei Shtylyov, (Thu Oct 18, 5:00 am)
Re: [PATCH 0/3] ide: Fix use of paired device, Benjamin Herrenschmidt, (Thu Oct 18, 5:14 am)
Re: [PATCH 2/3] ide: Fix siimage driver accessing beyond a ..., Benjamin Herrenschmidt, (Thu Oct 18, 5:16 am)
Re: [PATCH 0/3] ide: Fix use of paired device, Bartlomiej Zolnierki ..., (Thu Oct 18, 1:29 pm)
Re: [PATCH 1/3] ide: Add ide_get_paired_drive() helper, Bartlomiej Zolnierki ..., (Thu Oct 18, 2:10 pm)
Re: [PATCH 2/3] ide: Fix siimage driver accessing beyond a ..., Bartlomiej Zolnierki ..., (Thu Oct 18, 2:10 pm)
Re: [PATCH 3/3] ide: Fix cs5535 driver accessing beyond ar ..., Bartlomiej Zolnierki ..., (Thu Oct 18, 2:10 pm)
Re: [PATCH 2/3] ide: Fix siimage driver accessing beyond a ..., Bartlomiej Zolnierki ..., (Thu Oct 18, 2:30 pm)