From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 27 Sep 2012 20:05:42 +0000 (+0000)
Subject: ar71xx: avoid possible NULL pointer dereference in ath79_init_{,local}_mac
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=6d33dda88966d18ef9e2bc2d6d1d7f30bfc70d75;p=openwrt.git

ar71xx: avoid possible NULL pointer dereference in ath79_init_{,local}_mac

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33575 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
index d2d0ee87f0..4487958bc7 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
@@ -992,7 +992,10 @@ void __init ath79_init_mac(unsigned char *dst, const unsigned char *src,
 {
 	int t;
 
-	if (!is_valid_ether_addr(src)) {
+	if (!dst)
+		return;
+
+	if (!src || !is_valid_ether_addr(src)) {
 		memset(dst, '\0', ETH_ALEN);
 		return;
 	}
@@ -1012,7 +1015,10 @@ void __init ath79_init_local_mac(unsigned char *dst, const unsigned char *src)
 {
 	int i;
 
-	if (!is_valid_ether_addr(src)) {
+	if (!dst)
+		return;
+
+	if (!src || !is_valid_ether_addr(src)) {
 		memset(dst, '\0', ETH_ALEN);
 		return;
 	}