Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a87a87cc authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: Fix siimage driver accessing beyond array boundary 



The siimage uses an incorrect construct to access the other drive of a pair,
causing it to access beyond an array boundary on the secondary interface.

This fixes it by using the new ide_get_paired_drive() helper instead.

Bart: patch description fixes

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andrew Morton <akpm@osdl.org>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 1b678347

drivers/ide/pci/siimage.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio) 
	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);