[SRU][Xenial][V2][PATCH 1/1] UBUNTU: SAUCE: (noup) qla2xxx: Add irq affinity notification V2

Joseph Salisbury joseph.salisbury at canonical.com
Tue Apr 12 16:38:01 UTC 2016


From: Quinn Tran <quinn.tran at qlogic.com>

BugLink: http://bugs.launchpad.net/bugs/1554003

Commit cdb898c52d introduced a regression by accessing a Null pointer.  This occured
 when checking older 4G adapters, that do not have MSIX support.  Add a check for rsp->msix.

Fixes: commit cdb898c52d: ("qla2xxx: Add irq affinity notification")
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 drivers/scsi/qla2xxx/qla_isr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 4af9547..79469de 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2552,7 +2552,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
 	if (!vha->flags.online)
 		return;
 
-	if (rsp->msix->cpuid != smp_processor_id()) {
+	if (rsp->msix && (rsp->msix->cpuid != smp_processor_id())) {
 		/* if kernel does not notify qla of IRQ's CPU change,
 		 * then set it here.
 		 */
-- 
2.7.4





More information about the kernel-team mailing list