| Message ID | 1368783663-27672-1-git-send-email-jilin@nvidia.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 05/17/2013 03:41 AM, Jim Lin wrote: > If we try to boot from NET device, NetInitLoop in net.c will be invoked. > If NET device is not installed, eth_get_dev() function will return > eth_current value, which is NULL. > When NetInitLoop is called, "eth_get_dev->enetaddr" will access > restricted memory area and therefore cause hanging. > This issue is found on Tegra30 Cardhu platform after adding > CONFIG_CMD_NET and CONFIG_CMD_DHCP in config header file. Tested-by: Stephen Warren <swarren@nvidia.com> This fixes the crash I was seeing on the Cardhu board. Thanks.
On Fri, May 17, 2013 at 05:41:03PM +0800, Jim Lin wrote: > If we try to boot from NET device, NetInitLoop in net.c will be invoked. > If NET device is not installed, eth_get_dev() function will return > eth_current value, which is NULL. > When NetInitLoop is called, "eth_get_dev->enetaddr" will access > restricted memory area and therefore cause hanging. > This issue is found on Tegra30 Cardhu platform after adding > CONFIG_CMD_NET and CONFIG_CMD_DHCP in config header file. > > Signed-off-by: Jim Lin <jilin@nvidia.com> > Tested-by: Stephen Warren <swarren@nvidia.com> Applied to u-boot/master, thanks!
diff --git a/net/net.c b/net/net.c index df94789..7663b9c 100644 --- a/net/net.c +++ b/net/net.c @@ -271,7 +271,8 @@ static void NetInitLoop(void) #endif env_changed_id = env_id; } - memcpy(NetOurEther, eth_get_dev()->enetaddr, 6); + if (eth_get_dev()) + memcpy(NetOurEther, eth_get_dev()->enetaddr, 6); return; }
If we try to boot from NET device, NetInitLoop in net.c will be invoked. If NET device is not installed, eth_get_dev() function will return eth_current value, which is NULL. When NetInitLoop is called, "eth_get_dev->enetaddr" will access restricted memory area and therefore cause hanging. This issue is found on Tegra30 Cardhu platform after adding CONFIG_CMD_NET and CONFIG_CMD_DHCP in config header file. Signed-off-by: Jim Lin <jilin@nvidia.com> --- net/net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)