mpc86xx: protect memcpy to bad address if a mac-address is missing from dt

PATCH New Kim Phillips 1 participant 1 message Jan 31, 2007

lore

Share & tools

lore

Kim Phillips

author

2007-01-31 00:09 UTC #0 lore raw

PATCH 1/1 mpc86xx: protect memcpy to bad address if a mac-address is missing from dt

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(-)

cpu/mpc86xx/cpu.c +8 -4

index 551b243..bdbf841 100644
@@ -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
 
 }

Signature · 1 line

1.4.4