Patchwork [U-Boot,1/1] NET: Fix system hanging if NET device is not installed

login
register
mail settings
Submitter Jim Lin
Date May 17, 2013, 9:41 a.m.
Message ID <1368783663-27672-1-git-send-email-jilin@nvidia.com>
Download mbox | patch
Permalink /patch/244588/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Jim Lin - May 17, 2013, 9:41 a.m.
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(-)
Stephen Warren - May 18, 2013, 12:18 a.m.
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.
Tom Rini - June 19, 2013, 12:36 p.m.
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!

Patch

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;
 }