Skip to content

Commit

Permalink
mac80211: fix ieee80211_change_mac() to use struct sockaddr
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kalle Valo authored and John W. Linville committed Jan 5, 2010
1 parent 1990ca6 commit fc5f757
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,16 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
static int ieee80211_change_mac(struct net_device *dev, void *addr)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct sockaddr *sa = addr;
int ret;

if (ieee80211_sdata_running(sdata))
return -EBUSY;

ret = eth_mac_addr(dev, addr);
ret = eth_mac_addr(dev, sa);

if (ret == 0)
memcpy(sdata->vif.addr, addr, ETH_ALEN);
memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN);

return ret;
}
Expand Down

0 comments on commit fc5f757

Please sign in to comment.