diff options
author | Kalle Valo <kalle.valo@nokia.com> | 2009-12-30 08:54:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:13:16 -0500 |
commit | fc5f75773c0b3c5b44785e4efcc54c5f496211a9 (patch) | |
tree | 56789050d60906ffcccf29355e41a347747071ba /net/mac80211 | |
parent | 1990ca6113399be9249433d5ab377a2a444f1dd8 (diff) |
mac80211: fix ieee80211_change_mac() to use struct sockaddr
Setting the mac address from user space was buggy. For example, when
executing this command:
ip link set wlan0 address 00:1f:df:88:cd:55
mac80211 used the address 01:00:00:1f:df:88 instead. It was shifted two
bytes.
The reason was that the addr (type of void *) provided to
ieee80211_change_mac() is actually of type struct sockaddr, not just the
mac address array. Also the call to eth_mac_addr() expects the address to
be struct sockaddr.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/iface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 00a1f4ccdaf1..72189661fc49 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -63,15 +63,16 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu) | |||
63 | static int ieee80211_change_mac(struct net_device *dev, void *addr) | 63 | static int ieee80211_change_mac(struct net_device *dev, void *addr) |
64 | { | 64 | { |
65 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 65 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
66 | struct sockaddr *sa = addr; | ||
66 | int ret; | 67 | int ret; |
67 | 68 | ||
68 | if (ieee80211_sdata_running(sdata)) | 69 | if (ieee80211_sdata_running(sdata)) |
69 | return -EBUSY; | 70 | return -EBUSY; |
70 | 71 | ||
71 | ret = eth_mac_addr(dev, addr); | 72 | ret = eth_mac_addr(dev, sa); |
72 | 73 | ||
73 | if (ret == 0) | 74 | if (ret == 0) |
74 | memcpy(sdata->vif.addr, addr, ETH_ALEN); | 75 | memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN); |
75 | 76 | ||
76 | return ret; | 77 | return ret; |
77 | } | 78 | } |