Commit c545f637 authored Nov 15, 2017 by Robin Murphy Committed by Rob Herring Nov 16, 2017

of/pci: Fix theoretical NULL dereference



In the (relatively mechanical) process of adapting the RID-mapping code
to put the resulting ID in an output argument rather than the funtion
return value, we ended up with the debug print using the argument
pointer rather than the local value, which potentially defeats the
earlier NULL check.

Fixes: 987068fc: "of/irq: Break out msi-map lookup (again)"
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>

parent aa25e446

drivers/of/of_pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -374,7 +374,7 @@ int of_pci_map_rid(struct device_node *np, u32 rid,

		pr_debug("%pOF: %s, using mask %08x, rid-base: %08x, out-base: %08x, length: %08x, rid: %08x -> %08x\n",
		np, map_name, map_mask, rid_base, out_base,
		rid_len, rid, *id_out);
		rid_len, rid, masked_rid - rid_base + out_base);
		return 0;
		}