aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-01-18 18:04:50 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-01-18 18:04:50 +0000
commit10d78ebc85b7afada0895bc2a3ac147be331da94 (patch)
tree8bd2ea0b3b32c1487b82c9699529f0530264db05 /target/linux/ar71xx
parent5407d30b8f7a7756cdd312f79b7eb6458c0d9c08 (diff)
downloadupstream-10d78ebc85b7afada0895bc2a3ac147be331da94.tar.gz
upstream-10d78ebc85b7afada0895bc2a3ac147be331da94.tar.bz2
upstream-10d78ebc85b7afada0895bc2a3ac147be331da94.zip
[ar71xx] fix null pointer access in mach-dir-600-a1.c machine setup (#8671)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25043 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
index c3b526cd34..bb59dfb7a7 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
@@ -118,8 +118,8 @@ static void __init dir_600_a1_setup(void)
if (nvram_parse_mac_addr(nvram, DIR_600_A1_NVRAM_SIZE,
"lan_mac=", mac_buff) == 0) {
- ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
- ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
+ ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac_buff, 0);
+ ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac_buff, 1);
mac = mac_buff;
}