V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

net: eth: Check return value in various places 

eth_get_dev() can return NULL which means device_probe() fails for
that ethernet device. Add return value check in various places or
U-Boot will crash due to NULL pointer access.

With this commit, 'dm_test_eth_act' test case passes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Bin Meng 2015-10-07 21:45:44 -07:00 committed by Joe Hershberger
parent 6d9764c2a8
commit ac1d313806
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/eth.c
View File

@ -179,8 +179,12 @@ struct udevice *eth_get_dev(void)
*/ */
static void eth_set_dev(struct udevice *dev) static void eth_set_dev(struct udevice *dev)
{ {
if (dev && !device_active(dev)) if (dev && !device_active(dev)) {
eth_errno = device_probe(dev); eth_errno = device_probe(dev);
if (eth_errno)
dev = NULL;
}
eth_get_uclass_priv()->current = dev; eth_get_uclass_priv()->current = dev;
} }
@ -213,10 +217,9 @@ struct udevice *eth_get_dev_by_name(const char *devname)
* match an alias or it will match a literal name and we'll pick * match an alias or it will match a literal name and we'll pick
* up the error when we try to probe again in eth_set_dev(). * up the error when we try to probe again in eth_set_dev().
*/ */
device_probe(it); if (device_probe(it))
/* continue;
* Check for the name or the sequence number to match /* Check for the name or the sequence number to match */
*/
if (strcmp(it->name, devname) == 0 || if (strcmp(it->name, devname) == 0 ||
(endp > startp && it->seq == seq)) (endp > startp && it->seq == seq))
return it; return it;
@ -346,22 +349,26 @@ int eth_init(void)
old_current = current; old_current = current;
do { do {
debug("Trying %s\n", current->name); if (current) {
debug("Trying %s\n", current->name);
if (device_active(current)) { if (device_active(current)) {
ret = eth_get_ops(current)->start(current); ret = eth_get_ops(current)->start(current);
if (ret >= 0) { if (ret >= 0) {
struct eth_device_priv *priv = struct eth_device_priv *priv =
current->uclass_priv; current->uclass_priv;
priv->state = ETH_STATE_ACTIVE; priv->state = ETH_STATE_ACTIVE;
return 0; return 0;
}
} else {
ret = eth_errno;
} }
} else {
ret = eth_errno;
}
debug("FAIL\n"); debug("FAIL\n");
} else {
debug("PROBE FAIL\n");
}
/* /*
* If ethrotate is enabled, this will change "current", * If ethrotate is enabled, this will change "current",