Commit 42420c50 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

s390/pci: Fix missing check for zpci_create_device() error return 



The zpci_create_device() function returns an error pointer that needs to
be checked before dereferencing it as a struct zpci_dev pointer. Add the
missing check in __clp_add() where it was missed when adding the
scan_list in the fixed commit. Simply not adding the device to the scan
list results in the previous behavior.

Cc: stable@vger.kernel.org
Fixes: 0467cdde ("s390/pci: Sort PCI functions prior to creating virtual busses")
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarGerd Bayer <gbayer@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 3a47b1e3

arch/s390/pci/pci_clp.c

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ static void __clp_add(struct clp_fh_list_entry *entry, void *data) 
		return;

	}

	zdev = zpci_create_device(entry->fid, entry->fh, entry->config_state);

	if (IS_ERR(zdev))

		return;

	list_add_tail(&zdev->entry, scan_list);

}