Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b76e5e93 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] EEH: Avoid a possible NULL pointer dereference 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1dee2026

arch/powerpc/platforms/pseries/eeh_driver.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -310,8 +310,6 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event) 
	const char *location, *pci_str, *drv_str;

	const char *location, *pci_str, *drv_str;





	frozen_dn = find_device_pe(event->dn);

	frozen_dn = find_device_pe(event->dn);

	frozen_bus = pcibios_find_pci_bus(frozen_dn);



	if (!frozen_dn) {

	if (!frozen_dn) {





		location = of_get_property(event->dn, "ibm,loc-code", NULL);

		location = of_get_property(event->dn, "ibm,loc-code", NULL);
@@ -321,6 +319,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event) 
		        location, pci_name(event->dev));

		        location, pci_name(event->dev));

		return NULL;

		return NULL;

	}

	}



	frozen_bus = pcibios_find_pci_bus(frozen_dn);

	location = of_get_property(frozen_dn, "ibm,loc-code", NULL);

	location = of_get_property(frozen_dn, "ibm,loc-code", NULL);

	location = location ? location : "unknown";

	location = location ? location : "unknown";