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

Commit 783393e1 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

scsi: dpt_i2o: Do not process completions with invalid addresses 



adpt_isr() reads reply addresses from a hardware register, which
should always be within the DMA address range of the device's pool of
reply address buffers.  In case the address is out of range, it tries
to muddle on, converting to a virtual address using bus_to_virt().

bus_to_virt() does not take DMA addresses, and it doesn't make sense
to try to handle the completion in this case.  Ignore it and continue
looping to service the interrupt.  If a completion has been lost then
the SCSI core should eventually time-out and trigger a reset.

There is no corresponding upstream commit, because this driver was
removed upstream.

Fixes: 67af2b06 ("[SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt ...")
Signed-off-by: default avatarBen Hutchings <benh@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b88816a

drivers/scsi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ config SCSI_MVUMI 


config SCSI_DPT_I2O

	tristate "Adaptec I2O RAID support "

	depends on SCSI && PCI && VIRT_TO_BUS

	depends on SCSI && PCI

	help

	  This driver supports all of Adaptec's I2O based RAID controllers as 

	  well as the DPT SmartRaid V cards.  This is an Adaptec maintained

drivers/scsi/dpt_i2o.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver"); 


#include <asm/processor.h>	/* for boot_cpu_data */

#include <asm/pgtable.h>

#include <asm/io.h>		/* for virt_to_bus, etc. */

#include <asm/io.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -1914,7 +1914,7 @@ static irqreturn_t adpt_isr(int irq, void *dev_id) 
		} else {

			/* Ick, we should *never* be here */

			printk(KERN_ERR "dpti: reply frame not from pool\n");

			reply = (u8 *)bus_to_virt(m);

			continue;

		}



		if (readl(reply) & MSG_FAIL) {