Patch "cxl: Check if vphb exists before iterating over AFU devices" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
cxl: Check if vphb exists before iterating over AFU devices
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
12841f87b7a8ceb3d54f171660f72a86941bfcb3Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <[email protected]>
Date: Thu, 23 Nov 2017 09:08:57 +0530
Subject: cxl: Check if vphb exists before iterating over AFU devices
From: Vaibhav Jain <[email protected]>
commit 12841f87b7a8ceb3d54f171660f72a86941bfcb3 upstream.
During an eeh a kernel-oops is reported if no vPHB is allocated to the AFU. This happens as during AFU init, an error in creation of vPHB is a non-fatal error. Hence afu->phb should always be checked for NULL before iterating over it for the virtual AFU pci devices.
This patch fixes the kenel-oops by adding a NULL pointer check for afu->phb before it is dereferenced.
--- drivers/misc/cxl/pci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/misc/cxl/pci.c +10 -2
@@ -2043,6 +2043,9 @@ static pci_ers_result_t cxl_vphb_error_d/* There should only be one entry, but go through the list * anyway */ +if (afu->phb ==NULL ) +return result; +list_for_each_entry (afu_dev, &afu->phb->bus->devices, bus_list) {if (!afu_dev->driver)continue ;
@@ -2084,8 +2087,7 @@ static pci_ers_result_t cxl_pci_error_de* Tell the AFU drivers; but we don't care what they * say, we're going away. */ -if (afu->phb !=NULL ) -cxl_vphb_error_detected (afu, state); +cxl_vphb_error_detected (afu, state); }return PCI_ERS_RESULT_DISCONNECT ; }
@@ -2225,6 +2227,9 @@ static pci_ers_result_t cxl_pci_slot_resif (cxl_afu_select_best_mode (afu)) goto err; +if (afu->phb ==NULL ) +continue ; +list_for_each_entry (afu_dev, &afu->phb->bus->devices, bus_list) {/* Reset the device context. * TODO: make this less disruptive
@@ -2287,6 +2292,9 @@ static void cxl_pci_resume(struct pci_defor (i =0 ; i < adapter->slices; i++) { afu = adapter->afu[i]; +if (afu->phb ==NULL ) +continue ; +list_for_each_entry (afu_dev, &afu->phb->bus->devices, bus_list) {if (afu_dev->driver && afu_dev->driver->err_handler && afu_dev->driver->err_handler->resume)
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch