Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

cxl: Avoid double free_irq() for psl,slice interrupts

During an eeh call to cxl_remove can result in double free_irq of
psl,slice interrupts. This can happen if perst_reloads_same_image == 1
and call to cxl_configure_adapter() fails during slot_reset
callback. In such a case we see a kernel oops with following back-trace:

Oops: Kernel access of bad area, sig: 11 [#1]
Call Trace:
free_irq+0x88/0xd0 (unreliable)
cxl_unmap_irq+0x20/0x40 [cxl]
cxl_native_release_psl_irq+0x78/0xd8 [cxl]
pci_deconfigure_afu+0xac/0x110 [cxl]
cxl_remove+0x104/0x210 [cxl]
pci_device_remove+0x6c/0x110
device_release_driver_internal+0x204/0x2e0
pci_stop_bus_device+0xa0/0xd0
pci_stop_and_remove_bus_device+0x28/0x40
pci_hp_remove_devices+0xb0/0x150
pci_hp_remove_devices+0x68/0x150
eeh_handle_normal_event+0x140/0x580
eeh_handle_event+0x174/0x360
eeh_event_handler+0x1e8/0x1f0

This patch fixes the issue of double free_irq by checking that
variables that hold the virqs (err_hwirq, serr_hwirq, psl_virq) are
not '0' before un-mapping and resetting these variables to '0' when
they are un-mapped.

Cc: stable@vger.kernel.org
Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Vaibhav Jain and committed by
Greg Kroah-Hartman
ed45509b 6f9193ec

+11 -3
+11 -3
drivers/misc/cxl/native.c
··· 1302 1302 1303 1303 void cxl_native_release_psl_err_irq(struct cxl *adapter) 1304 1304 { 1305 - if (adapter->native->err_virq != irq_find_mapping(NULL, adapter->native->err_hwirq)) 1305 + if (adapter->native->err_virq == 0 || 1306 + adapter->native->err_virq != 1307 + irq_find_mapping(NULL, adapter->native->err_hwirq)) 1306 1308 return; 1307 1309 1308 1310 cxl_p1_write(adapter, CXL_PSL_ErrIVTE, 0x0000000000000000); 1309 1311 cxl_unmap_irq(adapter->native->err_virq, adapter); 1310 1312 cxl_ops->release_one_irq(adapter, adapter->native->err_hwirq); 1311 1313 kfree(adapter->irq_name); 1314 + adapter->native->err_virq = 0; 1312 1315 } 1313 1316 1314 1317 int cxl_native_register_serr_irq(struct cxl_afu *afu) ··· 1349 1346 1350 1347 void cxl_native_release_serr_irq(struct cxl_afu *afu) 1351 1348 { 1352 - if (afu->serr_virq != irq_find_mapping(NULL, afu->serr_hwirq)) 1349 + if (afu->serr_virq == 0 || 1350 + afu->serr_virq != irq_find_mapping(NULL, afu->serr_hwirq)) 1353 1351 return; 1354 1352 1355 1353 cxl_p1n_write(afu, CXL_PSL_SERR_An, 0x0000000000000000); 1356 1354 cxl_unmap_irq(afu->serr_virq, afu); 1357 1355 cxl_ops->release_one_irq(afu->adapter, afu->serr_hwirq); 1358 1356 kfree(afu->err_irq_name); 1357 + afu->serr_virq = 0; 1359 1358 } 1360 1359 1361 1360 int cxl_native_register_psl_irq(struct cxl_afu *afu) ··· 1380 1375 1381 1376 void cxl_native_release_psl_irq(struct cxl_afu *afu) 1382 1377 { 1383 - if (afu->native->psl_virq != irq_find_mapping(NULL, afu->native->psl_hwirq)) 1378 + if (afu->native->psl_virq == 0 || 1379 + afu->native->psl_virq != 1380 + irq_find_mapping(NULL, afu->native->psl_hwirq)) 1384 1381 return; 1385 1382 1386 1383 cxl_unmap_irq(afu->native->psl_virq, afu); 1387 1384 cxl_ops->release_one_irq(afu->adapter, afu->native->psl_hwirq); 1388 1385 kfree(afu->psl_irq_name); 1386 + afu->native->psl_virq = 0; 1389 1387 } 1390 1388 1391 1389 static void recover_psl_err(struct cxl_afu *afu, u64 errstat)