Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc

[mv-sheeva.git] / net / ieee802154 / nl-phy.c

diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index ed0eab39f531f028e96deaa5f61755c46c4e5855..c64a38d57aa36c4b521fd06c7a9c8c46bd0f337b 100644 (file)
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -24,6 +24,7 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/if_arp.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 #include <net/wpan-phy.h>
@@ -44,7 +45,7 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 pid,
        pr_debug("%s\n", __func__);
 
        if (!buf)
-               goto out;
+               return -EMSGSIZE;
 
        hdr = genlmsg_put(msg, 0, seq, &nl802154_family, flags,
                IEEE802154_LIST_PHY);
@@ -65,6 +66,7 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 pid,
                                pages * sizeof(uint32_t), buf);
 
        mutex_unlock(&phy->pib_lock);
+       kfree(buf);
        return genlmsg_end(msg, hdr);
 
 nla_put_failure:
@@ -212,12 +214,37 @@ static int ieee802154_add_iface(struct sk_buff *skb,
                goto nla_put_failure;
        }
 
+       if (info->attrs[IEEE802154_ATTR_HW_ADDR] &&
+           nla_len(info->attrs[IEEE802154_ATTR_HW_ADDR]) !=
+                       IEEE802154_ADDR_LEN) {
+               rc = -EINVAL;
+               goto nla_put_failure;
+       }
+
        dev = phy->add_iface(phy, devname);
        if (IS_ERR(dev)) {
                rc = PTR_ERR(dev);
                goto nla_put_failure;
        }
 
+       if (info->attrs[IEEE802154_ATTR_HW_ADDR]) {
+               struct sockaddr addr;
+
+               addr.sa_family = ARPHRD_IEEE802154;
+               nla_memcpy(&addr.sa_data, info->attrs[IEEE802154_ATTR_HW_ADDR],
+                               IEEE802154_ADDR_LEN);
+
+               /*
+                * strangely enough, some callbacks (inetdev_event) from
+                * dev_set_mac_address require RTNL_LOCK
+                */
+               rtnl_lock();
+               rc = dev_set_mac_address(dev, &addr);
+               rtnl_unlock();
+               if (rc)
+                       goto dev_unregister;
+       }
+
        NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
 
@@ -227,6 +254,11 @@ static int ieee802154_add_iface(struct sk_buff *skb,
 
        return ieee802154_nl_reply(msg, info);
 
+dev_unregister:
+       rtnl_lock(); /* del_iface must be called with RTNL lock */
+       phy->del_iface(phy, dev);
+       dev_put(dev);
+       rtnl_unlock();
 nla_put_failure:
        nlmsg_free(msg);
 out_dev: