From 8f691c2e62593403ad7d9a7a4a0b2524d83ef1d9 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 7 Jul 2016 09:17:54 -0400 Subject: [PATCH] Fix oops in qla2xxx driver (rhbz 1346753) --- kernel.spec | 4 + ...-NULL-pointer-deref-in-QLA-interrupt.patch | 98 +++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 qla2xxx-Fix-NULL-pointer-deref-in-QLA-interrupt.patch diff --git a/kernel.spec b/kernel.spec index c04ddcc94..9a25346da 100644 --- a/kernel.spec +++ b/kernel.spec @@ -627,6 +627,9 @@ Patch817: 0017-drm-i915-Remove-wm_config-from-dev_priv-intel_atomic.patch #rbhz 1351205 Patch833: drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch +#rhbz 1346753 +Patch834: qla2xxx-Fix-NULL-pointer-deref-in-QLA-interrupt.patch + # END OF PATCH DEFINITIONS %endif @@ -2153,6 +2156,7 @@ fi # %changelog * Thu Jul 07 2016 Josh Boyer +- Fix oops in qla2xxx driver (rhbz 1346753) - Fix blank screen on some nvidia cards (rbhz 1351205) * Thu Jul 7 2016 Peter Robinson diff --git a/qla2xxx-Fix-NULL-pointer-deref-in-QLA-interrupt.patch b/qla2xxx-Fix-NULL-pointer-deref-in-QLA-interrupt.patch new file mode 100644 index 000000000..4e50a65e2 --- /dev/null +++ b/qla2xxx-Fix-NULL-pointer-deref-in-QLA-interrupt.patch @@ -0,0 +1,98 @@ +From 36d17a40c174c8b77386520ab2a430fea760dcc3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bruno=20Pr=C3=83=C2=A9mont?= +Date: Thu, 30 Jun 2016 17:00:32 +0200 +Subject: [PATCH] qla2xxx: Fix NULL pointer deref in QLA interrupt +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In qla24xx_process_response_queue() rsp->msix->cpuid may trigger NULL +pointer dereference when rsp->msix is NULL: + +[ 5.622457] NULL pointer dereference at 0000000000000050 +[ 5.622457] IP: [] qla24xx_process_response_queue+0x44/0x4b0 +[ 5.622457] PGD 0 +[ 5.622457] Oops: 0000 [#1] SMP +[ 5.622457] Modules linked in: +[ 5.622457] CPU: 2 PID: 0 Comm: swapper/2 Not tainted 4.6.3-x86_64 #1 +[ 5.622457] Hardware name: HP ProLiant DL360 G5, BIOS P58 05/02/2011 +[ 5.622457] task: ffff8801a88f3740 ti: ffff8801a8954000 task.ti: ffff8801a8954000 +[ 5.622457] RIP: 0010:[] [] qla24xx_process_response_queue+0x44/0x4b0 +[ 5.622457] RSP: 0000:ffff8801afb03de8 EFLAGS: 00010002 +[ 5.622457] RAX: 0000000000000000 RBX: 0000000000000032 RCX: 00000000ffffffff +[ 5.622457] RDX: 0000000000000002 RSI: ffff8801a79bf8c8 RDI: ffff8800c8f7e7c0 +[ 5.622457] RBP: ffff8801afb03e68 R08: 0000000000000000 R09: 0000000000000000 +[ 5.622457] R10: 00000000ffff8c47 R11: 0000000000000002 R12: ffff8801a79bf8c8 +[ 5.622457] R13: ffff8800c8f7e7c0 R14: ffff8800c8f60000 R15: 0000000000018013 +[ 5.622457] FS: 0000000000000000(0000) GS:ffff8801afb00000(0000) knlGS:0000000000000000 +[ 5.622457] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 5.622457] CR2: 0000000000000050 CR3: 0000000001e07000 CR4: 00000000000006e0 +[ 5.622457] Stack: +[ 5.622457] ffff8801afb03e30 ffffffff810c0f2d 0000000000000086 0000000000000002 +[ 5.622457] ffff8801afb03e28 ffffffff816570e1 ffff8800c8994628 0000000000000002 +[ 5.622457] ffff8801afb03e60 ffffffff816772d4 b47c472ad6955e68 0000000000000032 +[ 5.622457] Call Trace: +[ 5.622457] +[ 5.622457] [] ? __wake_up_common+0x4d/0x80 +[ 5.622457] [] ? usb_hcd_resume_root_hub+0x51/0x60 +[ 5.622457] [] ? uhci_hub_status_data+0x64/0x240 +[ 5.622457] [] qla24xx_intr_handler+0xf0/0x2e0 +[ 5.622457] [] ? get_next_timer_interrupt+0xce/0x200 +[ 5.622457] [] handle_irq_event_percpu+0x64/0x100 +[ 5.622457] [] handle_irq_event+0x27/0x50 +[ 5.622457] [] handle_edge_irq+0x65/0x140 +[ 5.622457] [] handle_irq+0x18/0x30 +[ 5.622457] [] do_IRQ+0x46/0xd0 +[ 5.622457] [] common_interrupt+0x7f/0x7f +[ 5.622457] +[ 5.622457] [] ? mwait_idle+0x68/0x80 +[ 5.622457] [] arch_cpu_idle+0xa/0x10 +[ 5.622457] [] default_idle_call+0x27/0x30 +[ 5.622457] [] cpu_startup_entry+0x19b/0x230 +[ 5.622457] [] start_secondary+0x136/0x140 +[ 5.622457] Code: 00 00 65 48 8b 04 25 28 00 00 00 48 89 45 d0 31 c0 48 8b 47 58 a8 02 0f 84 c5 00 00 00 48 8b 46 50 49 89 f4 65 8b 15 34 bb aa 7e <39> 50 50 74 11 89 50 50 48 8b 46 50 8b 40 50 41 89 86 60 8b 00 +[ 5.622457] RIP [] qla24xx_process_response_queue+0x44/0x4b0 +[ 5.622457] RSP +[ 5.622457] CR2: 0000000000000050 +[ 5.622457] ---[ end trace fa2b19c25106d42b ]--- +[ 5.622457] Kernel panic - not syncing: Fatal exception in interrupt + +The affected code was introduced by commit cdb898c52d1dfad4b4800b83a58b3fe5d352edde +(qla2xxx: Add irq affinity notification). + +Only dereference rsp->msix when it has been set so the machine can boot +fine. Possibly rsp->msix is unset because: +[ 3.479679] qla2xxx [0000:00:00.0]-0005: : QLogic Fibre Channel HBA Driver: 8.07.00.33-k. +[ 3.481839] qla2xxx [0000:13:00.0]-001d: : Found an ISP2432 irq 17 iobase 0xffffc90000038000. +[ 3.484081] qla2xxx [0000:13:00.0]-0035:0: MSI-X; Unsupported ISP2432 (0x2, 0x3). +[ 3.485804] qla2xxx [0000:13:00.0]-0037:0: Falling back-to MSI mode -258. +[ 3.890145] scsi host0: qla2xxx +[ 3.891956] qla2xxx [0000:13:00.0]-00fb:0: QLogic QLE2460 - PCI-Express Single Channel 4Gb Fibre Channel HBA. +[ 3.894207] qla2xxx [0000:13:00.0]-00fc:0: ISP2432: PCIe (2.5GT/s x4) @ 0000:13:00.0 hdma+ host#=0 fw=7.03.00 (9496). +[ 5.714774] qla2xxx [0000:13:00.0]-500a:0: LOOP UP detected (4 Gbps). + +Signed-off-by: Bruno Prémont +Acked-by: Quinn Tran +CC: # 4.5+ +Fixes: cdb898c52d1dfad4b4800b83a58b3fe5d352edde +Signed-off-by: James Bottomley +--- + 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 5649c200d37c..a92a62dea793 100644 +--- a/drivers/scsi/qla2xxx/qla_isr.c ++++ b/drivers/scsi/qla2xxx/qla_isr.c +@@ -2548,7 +2548,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.5.5 +