* [U-Boot-Users] [PATCH] mpc86xx: protect memcpy to bad address if a mac-address is missing from dt
@ 2007-01-31 0:09 Kim Phillips
0 siblings, 0 replies; only message in thread
From: Kim Phillips @ 2007-01-31 0:09 UTC (permalink / raw)
To: u-boot
protect memcpy to bad address if a mac-address is missing from dt
---
cpu/mpc86xx/cpu.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index 551b243..bdbf841 100644
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -286,22 +286,26 @@ ft_cpu_setup(void *blob, bd_t *bd)
#if defined(CONFIG_MPC86XX_TSEC1)
p = ft_get_prop(blob, "/" OF_SOC "/ethernet at 24000/mac-address", &len);
- memcpy(p, bd->bi_enetaddr, 6);
+ if (p != NULL)
+ memcpy(p, bd->bi_enetaddr, 6);
#endif
#if defined(CONFIG_MPC86XX_TSEC2)
p = ft_get_prop(blob, "/" OF_SOC "/ethernet at 25000/mac-address", &len);
- memcpy(p, bd->bi_enet1addr, 6);
+ if (p != NULL)
+ memcpy(p, bd->bi_enet1addr, 6);
#endif
#if defined(CONFIG_MPC86XX_TSEC3)
p = ft_get_prop(blob, "/" OF_SOC "/ethernet at 26000/mac-address", &len);
- memcpy(p, bd->bi_enet2addr, 6);
+ if (p != NULL)
+ memcpy(p, bd->bi_enet2addr, 6);
#endif
#if defined(CONFIG_MPC86XX_TSEC4)
p = ft_get_prop(blob, "/" OF_SOC "/ethernet at 27000/mac-address", &len);
- memcpy(p, bd->bi_enet3addr, 6);
+ if (p != NULL)
+ memcpy(p, bd->bi_enet3addr, 6);
#endif
}
--
1.4.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-01-31 0:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-31 0:09 [U-Boot-Users] [PATCH] mpc86xx: protect memcpy to bad address if a mac-address is missing from dt Kim Phillips
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox