mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-06 03:20:41 +09:00
mpc86xx: protect memcpy to bad address if a mac-address is missing from dt
Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
parent
14da5f7675
commit
7dbdf28b8b
@ -280,22 +280,26 @@ ft_cpu_setup(void *blob, bd_t *bd)
|
|||||||
|
|
||||||
#if defined(CONFIG_MPC86XX_TSEC1)
|
#if defined(CONFIG_MPC86XX_TSEC1)
|
||||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len);
|
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len);
|
||||||
memcpy(p, bd->bi_enetaddr, 6);
|
if (p != NULL)
|
||||||
|
memcpy(p, bd->bi_enetaddr, 6);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_MPC86XX_TSEC2)
|
#if defined(CONFIG_MPC86XX_TSEC2)
|
||||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/mac-address", &len);
|
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/mac-address", &len);
|
||||||
memcpy(p, bd->bi_enet1addr, 6);
|
if (p != NULL)
|
||||||
|
memcpy(p, bd->bi_enet1addr, 6);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_MPC86XX_TSEC3)
|
#if defined(CONFIG_MPC86XX_TSEC3)
|
||||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@26000/mac-address", &len);
|
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@26000/mac-address", &len);
|
||||||
memcpy(p, bd->bi_enet2addr, 6);
|
if (p != NULL)
|
||||||
|
memcpy(p, bd->bi_enet2addr, 6);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_MPC86XX_TSEC4)
|
#if defined(CONFIG_MPC86XX_TSEC4)
|
||||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@27000/mac-address", &len);
|
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@27000/mac-address", &len);
|
||||||
memcpy(p, bd->bi_enet3addr, 6);
|
if (p != NULL)
|
||||||
|
memcpy(p, bd->bi_enet3addr, 6);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user