diff options
| author | David Miller <davem@davemloft.net> | 2006-11-20 00:21:04 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-11-20 00:21:04 +0100 |
| commit | 705cb93548ca3f5e552ea10832203373fb7b7917 (patch) | |
| tree | 44a9732f9a685f93acc0e1b6204c4e925070e5bf /net | |
| parent | 02db407979ff96eb7b619d3683155e5298021908 (diff) | |
| download | linux-stable-705cb93548ca3f5e552ea10832203373fb7b7917.tar.gz linux-stable-705cb93548ca3f5e552ea10832203373fb7b7917.tar.bz2 linux-stable-705cb93548ca3f5e552ea10832203373fb7b7917.zip | |
[RTNETLINK]: Fix IFLA_ADDRESS handling.
The ->set_mac_address handlers expect a pointer to a
sockaddr which contains the MAC address, whereas
IFLA_ADDRESS provides just the MAC address itself.
So whip up a sockaddr to wrap around the netlink
attribute for the ->set_mac_address call.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/rtnetlink.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index eca2976abb25..5faebd8a9dba 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -350,6 +350,9 @@ static int do_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) } if (ida[IFLA_ADDRESS - 1]) { + struct sockaddr *sa; + int len; + if (!dev->set_mac_address) { err = -EOPNOTSUPP; goto out; @@ -361,7 +364,17 @@ static int do_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) if (ida[IFLA_ADDRESS - 1]->rta_len != RTA_LENGTH(dev->addr_len)) goto out; - err = dev->set_mac_address(dev, RTA_DATA(ida[IFLA_ADDRESS - 1])); + len = sizeof(sa_family_t) + dev->addr_len; + sa = kmalloc(len, GFP_KERNEL); + if (!sa) { + err = -ENOMEM; + goto out; + } + sa->sa_family = dev->type; + memcpy(sa->sa_data, RTA_DATA(ida[IFLA_ADDRESS - 1]), + dev->addr_len); + err = dev->set_mac_address(dev, sa); + kfree(sa); if (err) goto out; send_addr_notify = 1; |