diff mbox

[U-Boot] eth_write_hwaddr: Return error for invalid MACs

Message ID 821911102.2280760.1344621381185.JavaMail.root@advansee.com
State Accepted
Delegated to: Joe Hershberger
Headers show

Commit Message

Benoît Thébaudeau Aug. 10, 2012, 5:56 p.m. UTC 
If dev->enetaddr was supposed to be set with dev->write_hwaddr() but the MAC
address was not valid, return an error.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 {u-boot-4d3c95f.orig => u-boot-4d3c95f}/net/eth.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Mike Frysinger Aug. 11, 2012, 5:48 p.m. UTC | #1 
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Joe Hershberger Sept. 28, 2012, 4:04 p.m. UTC | #2 
Hi Benoît,

On Fri, Aug 10, 2012 at 12:56 PM, Benoît Thébaudeau
<benoit.thebaudeau@advansee.com> wrote:
> If dev->enetaddr was supposed to be set with dev->write_hwaddr() but the MAC
> address was not valid, return an error.
>
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Cc: Joe Hershberger <joe.hershberger@gmail.com>
> ---

Applied, thanks.

-Joe
diff mbox

Patch

diff --git u-boot-4d3c95f.orig/net/eth.c u-boot-4d3c95f/net/eth.c
index 1a11ce1..174361f 100644
--- u-boot-4d3c95f.orig/net/eth.c
+++ u-boot-4d3c95f/net/eth.c
@@ -222,9 +222,12 @@  int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
 	}
 
 	if (dev->write_hwaddr &&
-			!eth_mac_skip(eth_number) &&
-			is_valid_ether_addr(dev->enetaddr))
+			!eth_mac_skip(eth_number)) {
+		if (!is_valid_ether_addr(dev->enetaddr))
+			return -1;
+
 		ret = dev->write_hwaddr(dev);
+	}
 
 	return ret;
 }