diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2008-03-22 14:20:29 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-24 17:55:48 +1100 |
| commit | b8c19eb16a7e6df57d0f6d67e42ce026e5d5930b (patch) | |
| tree | 5a8fd8fef3283cafbbe1419ca296eaa293d07afa /drivers | |
| parent | 1428a9fa586cb80acf98289f797f58b8bd662598 (diff) | |
| download | op-kernel-dev-b8c19eb16a7e6df57d0f6d67e42ce026e5d5930b.zip op-kernel-dev-b8c19eb16a7e6df57d0f6d67e42ce026e5d5930b.tar.gz | |
[POWERPC] mpc5200-fec: Fix possible NULL dereference in mdio driver
If the reg property is missing from the phy node (unlikely, but possible),
then the kernel will oops with a NULL pointer dereference. This fixes
it by checking the pointer first.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 1837584c..6a3ac4e 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c @@ -109,7 +109,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i int irq = irq_of_parse_and_map(child, 0); if (irq != NO_IRQ) { const u32 *id = of_get_property(child, "reg", NULL); - bus->irq[*id] = irq; + if (id) + bus->irq[*id] = irq; } } |
