* [PATCH] of/pci: Fix theoretical NULL dereference
@ 2017-11-15 12:50 Robin Murphy
2017-11-16 5:10 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Robin Murphy @ 2017-11-15 12:50 UTC (permalink / raw)
To: robh+dt, frowand.list; +Cc: devicetree, linux-kernel
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: 987068fcbdb7: "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>
---
drivers/of/of_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index e9ec931f5b9a..a7b1cb6c2f65 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -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;
}
--
2.13.4.dirty
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] of/pci: Fix theoretical NULL dereference
2017-11-15 12:50 [PATCH] of/pci: Fix theoretical NULL dereference Robin Murphy
@ 2017-11-16 5:10 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2017-11-16 5:10 UTC (permalink / raw)
To: Robin Murphy; +Cc: frowand.list, devicetree, linux-kernel
On Wed, Nov 15, 2017 at 12:50:06PM +0000, Robin Murphy wrote:
> 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: 987068fcbdb7: "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>
> ---
> drivers/of/of_pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied.
Rob
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-16 5:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-15 12:50 [PATCH] of/pci: Fix theoretical NULL dereference Robin Murphy
2017-11-16 5:10 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®