evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc/eeh: Avoid use after free in eeh_handle_special_event()

Browse source 
commit daeba2956f32f91f3493788ff6ee02fb1b2f02fa upstream.

eeh_handle_special_event() is called when an EEH event is detected but
can't be narrowed down to a specific PE.  This function looks through
every PE to find one in an erroneous state, then calls the regular event
handler eeh_handle_normal_event() once it knows which PE has an error.

However, if eeh_handle_normal_event() found that the PE cannot possibly
be recovered, it will free it, rendering the passed PE stale.
This leads to a use after free in eeh_handle_special_event() as it attempts to
clear the "recovering" state on the PE after eeh_handle_normal_event() returns.

Thus, make sure the PE is valid when attempting to clear state in
eeh_handle_special_event().

Fixes: 8a6b1bc70d ("powerpc/eeh: EEH core to handle special event")
Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Russell Currey <ruscur@russell.cc>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russell Currey 2017-04-19 17:39:26 +10:00 • committed by Greg Kroah-Hartman
parent 93d03807f3
commit fc7fb9430d
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/powerpc/kernel/eeh_driver.c
View file

@ -655,7 +655,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus)
*/ */
#define MAX_WAIT_FOR_RECOVERY 300 #define MAX_WAIT_FOR_RECOVERY 300
static void eeh_handle_normal_event(struct eeh_pe *pe) static bool eeh_handle_normal_event(struct eeh_pe *pe)
{ {
struct pci_bus *frozen_bus; struct pci_bus *frozen_bus;
int rc = 0; int rc = 0;
@ -665,7 +665,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
if (!frozen_bus) { if (!frozen_bus) {
pr_err("%s: Cannot find PCI bus for PHB#%d-PE#%x\n", pr_err("%s: Cannot find PCI bus for PHB#%d-PE#%x\n",
__func__, pe->phb->global_number, pe->addr); __func__, pe->phb->global_number, pe->addr);
return; return false;
} }
eeh_pe_update_time_stamp(pe); eeh_pe_update_time_stamp(pe);
@ -790,7 +790,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
pr_info("EEH: Notify device driver to resume\n"); pr_info("EEH: Notify device driver to resume\n");
eeh_pe_dev_traverse(pe, eeh_report_resume, NULL); eeh_pe_dev_traverse(pe, eeh_report_resume, NULL);
return; return false;
excess_failures: excess_failures:
/* /*
@ -831,7 +831,11 @@ perm_error:
pci_lock_rescan_remove(); pci_lock_rescan_remove();
pcibios_remove_pci_devices(frozen_bus); pcibios_remove_pci_devices(frozen_bus);
pci_unlock_rescan_remove(); pci_unlock_rescan_remove();
/* The passed PE should no longer be used */
return true;
} }
return false;
} }
static void eeh_handle_special_event(void) static void eeh_handle_special_event(void)
@ -897,7 +901,14 @@ static void eeh_handle_special_event(void)
*/ */
if (rc == EEH_NEXT_ERR_FROZEN_PE || if (rc == EEH_NEXT_ERR_FROZEN_PE ||
rc == EEH_NEXT_ERR_FENCED_PHB) { rc == EEH_NEXT_ERR_FENCED_PHB) {
eeh_handle_normal_event(pe); /*
* eeh_handle_normal_event() can make the PE stale if it
* determines that the PE cannot possibly be recovered.
* Don't modify the PE state if that's the case.
*/
if (eeh_handle_normal_event(pe))
continue;
eeh_pe_state_clear(pe, EEH_PE_RECOVERING); eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
} else { } else {
pci_lock_rescan_remove(); pci_lock_rescan_remove();