6 files changed, 148 insertions, 134 deletions

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 840821b90bcd..32eb4179e8fa 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -196,7 +196,7 @@ lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift, const struct in6_addr *ipaddr,
 static void
 lowpan_uip_ds6_set_addr_iid(struct in6_addr *ipaddr, unsigned char *lladdr)
 {
-        memcpy(&ipaddr->s6_addr[8], lladdr, IEEE802154_ALEN);
+        memcpy(&ipaddr->s6_addr[8], lladdr, IEEE802154_ADDR_LEN);
         /* second bit-flip (Universe/Local) is done according RFC2464 */
         ipaddr->s6_addr[8] ^= 0x02;
 }
@@ -221,7 +221,7 @@ lowpan_uncompress_addr(struct sk_buff *skb, struct in6_addr *ipaddr,
 
         if (lladdr)
                 lowpan_raw_dump_inline(__func__, "linklocal address",
-                                                lladdr, IEEE802154_ALEN);
+                                                lladdr, IEEE802154_ADDR_LEN);
         if (prefcount > 0)
                 memcpy(ipaddr, prefix, prefcount);
 
@@ -371,7 +371,7 @@ err:
 static int lowpan_header_create(struct sk_buff *skb,
                            struct net_device *dev,
                            unsigned short type, const void *_daddr,
-                           const void *_saddr, unsigned len)
+                           const void *_saddr, unsigned int len)
 {
         u8 tmp, iphc0, iphc1, *hc06_ptr;
         struct ipv6hdr *hdr;
@@ -650,6 +650,53 @@ static void lowpan_fragment_timer_expired(unsigned long entry_addr)
         kfree(entry);
 }
 
+static struct lowpan_fragment *
+lowpan_alloc_new_frame(struct sk_buff *skb, u8 iphc0, u8 len, u8 tag)
+{
+        struct lowpan_fragment *frame;
+
+        frame = kzalloc(sizeof(struct lowpan_fragment),
+                        GFP_ATOMIC);
+        if (!frame)
+                goto frame_err;
+
+        INIT_LIST_HEAD(&frame->list);
+
+        frame->length = (iphc0 & 7) | (len << 3);
+        frame->tag = tag;
+
+        /* allocate buffer for frame assembling */
+        frame->skb = alloc_skb(frame->length +
+                               sizeof(struct ipv6hdr), GFP_ATOMIC);
+
+        if (!frame->skb)
+                goto skb_err;
+
+        frame->skb->priority = skb->priority;
+        frame->skb->dev = skb->dev;
+
+        /* reserve headroom for uncompressed ipv6 header */
+        skb_reserve(frame->skb, sizeof(struct ipv6hdr));
+        skb_put(frame->skb, frame->length);
+
+        init_timer(&frame->timer);
+        /* time out is the same as for ipv6 - 60 sec */
+        frame->timer.expires = jiffies + LOWPAN_FRAG_TIMEOUT;
+        frame->timer.data = (unsigned long)frame;
+        frame->timer.function = lowpan_fragment_timer_expired;
+
+        add_timer(&frame->timer);
+
+        list_add_tail(&frame->list, &lowpan_fragments);
+
+        return frame;
+
+skb_err:
+        kfree(frame);
+frame_err:
+        return NULL;
+}
+
 static int
 lowpan_process_data(struct sk_buff *skb)
 {
@@ -692,41 +739,9 @@ lowpan_process_data(struct sk_buff *skb)
 
                 /* alloc new frame structure */
                 if (!found) {
-                        frame = kzalloc(sizeof(struct lowpan_fragment),
-                                                                GFP_ATOMIC);
+                        frame = lowpan_alloc_new_frame(skb, iphc0, len, tag);
                         if (!frame)
                                 goto unlock_and_drop;
-
-                        INIT_LIST_HEAD(&frame->list);
-
-                        frame->length = (iphc0 & 7) | (len << 3);
-                        frame->tag = tag;
-
-                        /* allocate buffer for frame assembling */
-                        frame->skb = alloc_skb(frame->length +
-                                        sizeof(struct ipv6hdr), GFP_ATOMIC);
-
-                        if (!frame->skb) {
-                                kfree(frame);
-                                goto unlock_and_drop;
-                        }
-
-                        frame->skb->priority = skb->priority;
-                        frame->skb->dev = skb->dev;
-
-                        /* reserve headroom for uncompressed ipv6 header */
-                        skb_reserve(frame->skb, sizeof(struct ipv6hdr));
-                        skb_put(frame->skb, frame->length);
-
-                        init_timer(&frame->timer);
-                        /* time out is the same as for ipv6 - 60 sec */
-                        frame->timer.expires = jiffies + LOWPAN_FRAG_TIMEOUT;
-                        frame->timer.data = (unsigned long)frame;
-                        frame->timer.function = lowpan_fragment_timer_expired;
-
-                        add_timer(&frame->timer);
-
-                        list_add_tail(&frame->list, &lowpan_fragments);
                 }
 
                 if ((iphc0 & LOWPAN_DISPATCH_MASK) == LOWPAN_DISPATCH_FRAG1)
diff --git a/net/ieee802154/6lowpan.h b/net/ieee802154/6lowpan.h
index aeff3f310482..8c2251fb0a3f 100644
--- a/net/ieee802154/6lowpan.h
+++ b/net/ieee802154/6lowpan.h
@@ -53,9 +53,6 @@
 #ifndef __6LOWPAN_H__
 #define __6LOWPAN_H__
 
-/* need to know address length to manipulate with it */
-#define IEEE802154_ALEN         8
-
 #define UIP_802154_SHORTADDR_LEN        2  /* compressed ipv6 address length */
 #define UIP_IPH_LEN                     40 /* ipv6 fixed header size */
 #define UIP_PROTO_UDP                   17 /* ipv6 next header value for UDP */
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 1b09eaabaac1..6fbb2ad7bb6d 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -44,8 +44,8 @@ struct dgram_sock {
         struct ieee802154_addr src_addr;
         struct ieee802154_addr dst_addr;
 
-        unsigned bound:1;
-        unsigned want_ack:1;
+        unsigned int bound:1;
+        unsigned int want_ack:1;
 };
 
 static inline struct dgram_sock *dgram_sk(const struct sock *sk)
@@ -206,7 +206,7 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
                 struct msghdr *msg, size_t size)
 {
         struct net_device *dev;
-        unsigned mtu;
+        unsigned int mtu;
         struct sk_buff *skb;
         struct dgram_sock *ro = dgram_sk(sk);
         int hlen, tlen;
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index adaf46214905..ca92587720f4 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -63,15 +63,14 @@ int ieee802154_nl_assoc_indic(struct net_device *dev,
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-
-        NLA_PUT(msg, IEEE802154_ATTR_SRC_HW_ADDR, IEEE802154_ADDR_LEN,
-                        addr->hwaddr);
-
-        NLA_PUT_U8(msg, IEEE802154_ATTR_CAPABILITY, cap);
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put(msg, IEEE802154_ATTR_SRC_HW_ADDR, IEEE802154_ADDR_LEN,
+                    addr->hwaddr) ||
+            nla_put_u8(msg, IEEE802154_ATTR_CAPABILITY, cap))
+                goto nla_put_failure;
 
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
@@ -92,14 +91,13 @@ int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr,
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-
-        NLA_PUT_U16(msg, IEEE802154_ATTR_SHORT_ADDR, short_addr);
-        NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put_u16(msg, IEEE802154_ATTR_SHORT_ADDR, short_addr) ||
+            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status))
+                goto nla_put_failure;
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
 nla_put_failure:
@@ -119,20 +117,22 @@ int ieee802154_nl_disassoc_indic(struct net_device *dev,
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-
-        if (addr->addr_type == IEEE802154_ADDR_LONG)
-                NLA_PUT(msg, IEEE802154_ATTR_SRC_HW_ADDR, IEEE802154_ADDR_LEN,
-                                addr->hwaddr);
-        else
-                NLA_PUT_U16(msg, IEEE802154_ATTR_SRC_SHORT_ADDR,
-                                addr->short_addr);
-
-        NLA_PUT_U8(msg, IEEE802154_ATTR_REASON, reason);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr))
+                goto nla_put_failure;
+        if (addr->addr_type == IEEE802154_ADDR_LONG) {
+                if (nla_put(msg, IEEE802154_ATTR_SRC_HW_ADDR, IEEE802154_ADDR_LEN,
+                            addr->hwaddr))
+                        goto nla_put_failure;
+        } else {
+                if (nla_put_u16(msg, IEEE802154_ATTR_SRC_SHORT_ADDR,
+                                addr->short_addr))
+                        goto nla_put_failure;
+        }
+        if (nla_put_u8(msg, IEEE802154_ATTR_REASON, reason))
+                goto nla_put_failure;
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
 nla_put_failure:
@@ -151,13 +151,12 @@ int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status)
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-
-        NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status))
+                goto nla_put_failure;
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
 nla_put_failure:
@@ -177,13 +176,13 @@ int ieee802154_nl_beacon_indic(struct net_device *dev,
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-        NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_SHORT_ADDR, coord_addr);
-        NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_PAN_ID, panid);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put_u16(msg, IEEE802154_ATTR_COORD_SHORT_ADDR, coord_addr) ||
+            nla_put_u16(msg, IEEE802154_ATTR_COORD_PAN_ID, panid))
+                goto nla_put_failure;
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
 nla_put_failure:
@@ -204,19 +203,17 @@ int ieee802154_nl_scan_confirm(struct net_device *dev,
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-
-        NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status);
-        NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned);
-        NLA_PUT_U8(msg, IEEE802154_ATTR_PAGE, page);
-
-        if (edl)
-                NLA_PUT(msg, IEEE802154_ATTR_ED_LIST, 27, edl);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status) ||
+            nla_put_u8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type) ||
+            nla_put_u32(msg, IEEE802154_ATTR_CHANNELS, unscanned) ||
+            nla_put_u8(msg, IEEE802154_ATTR_PAGE, page) ||
+            (edl &&
+             nla_put(msg, IEEE802154_ATTR_ED_LIST, 27, edl)))
+                goto nla_put_failure;
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
 nla_put_failure:
@@ -235,13 +232,12 @@ int ieee802154_nl_start_confirm(struct net_device *dev, u8 status)
         if (!msg)
                 return -ENOBUFS;
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                        dev->dev_addr);
-
-        NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status))
+                goto nla_put_failure;
         return ieee802154_nl_mcast(msg, ieee802154_coord_mcgrp.id);
 
 nla_put_failure:
@@ -266,16 +262,16 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 pid,
         phy = ieee802154_mlme_ops(dev)->get_phy(dev);
         BUG_ON(!phy);
 
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
-        NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
-
-        NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                dev->dev_addr);
-        NLA_PUT_U16(msg, IEEE802154_ATTR_SHORT_ADDR,
-                ieee802154_mlme_ops(dev)->get_short_addr(dev));
-        NLA_PUT_U16(msg, IEEE802154_ATTR_PAN_ID,
-                ieee802154_mlme_ops(dev)->get_pan_id(dev));
+        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
+            nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||
+            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
+            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
+                    dev->dev_addr) ||
+            nla_put_u16(msg, IEEE802154_ATTR_SHORT_ADDR,
+                        ieee802154_mlme_ops(dev)->get_short_addr(dev)) ||
+            nla_put_u16(msg, IEEE802154_ATTR_PAN_ID,
+                        ieee802154_mlme_ops(dev)->get_pan_id(dev)))
+                goto nla_put_failure;
         wpan_phy_put(phy);
         return genlmsg_end(msg, hdr);
 
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index c64a38d57aa3..eed291626da6 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -53,18 +53,18 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 pid,
                 goto out;
 
         mutex_lock(&phy->pib_lock);
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
-
-        NLA_PUT_U8(msg, IEEE802154_ATTR_PAGE, phy->current_page);
-        NLA_PUT_U8(msg, IEEE802154_ATTR_CHANNEL, phy->current_channel);
+        if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||
+            nla_put_u8(msg, IEEE802154_ATTR_PAGE, phy->current_page) ||
+            nla_put_u8(msg, IEEE802154_ATTR_CHANNEL, phy->current_channel))
+                goto nla_put_failure;
         for (i = 0; i < 32; i++) {
                 if (phy->channels_supported[i])
                         buf[pages++] = phy->channels_supported[i] | (i << 27);
         }
-        if (pages)
-                NLA_PUT(msg, IEEE802154_ATTR_CHANNEL_PAGE_LIST,
-                                pages * sizeof(uint32_t), buf);
-
+        if (pages &&
+            nla_put(msg, IEEE802154_ATTR_CHANNEL_PAGE_LIST,
+                    pages * sizeof(uint32_t), buf))
+                goto nla_put_failure;
         mutex_unlock(&phy->pib_lock);
         kfree(buf);
         return genlmsg_end(msg, hdr);
@@ -179,6 +179,7 @@ static int ieee802154_add_iface(struct sk_buff *skb,
         const char *devname;
         int rc = -ENOBUFS;
         struct net_device *dev;
+        int type = __IEEE802154_DEV_INVALID;
 
         pr_debug("%s\n", __func__);
 
@@ -221,7 +222,13 @@ static int ieee802154_add_iface(struct sk_buff *skb,
                 goto nla_put_failure;
         }
 
-        dev = phy->add_iface(phy, devname);
+        if (info->attrs[IEEE802154_ATTR_DEV_TYPE]) {
+                type = nla_get_u8(info->attrs[IEEE802154_ATTR_DEV_TYPE]);
+                if (type >= __IEEE802154_DEV_MAX)
+                        return -EINVAL;
+        }
+
+        dev = phy->add_iface(phy, devname, type);
         if (IS_ERR(dev)) {
                 rc = PTR_ERR(dev);
                 goto nla_put_failure;
@@ -245,9 +252,9 @@ static int ieee802154_add_iface(struct sk_buff *skb,
                         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);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||
+            nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name))
+                goto nla_put_failure;
         dev_put(dev);
 
         wpan_phy_put(phy);
@@ -333,10 +340,9 @@ static int ieee802154_del_iface(struct sk_buff *skb,
 
         rtnl_unlock();
 
-
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
-        NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, name);
-
+        if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||
+            nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, name))
+                goto nla_put_failure;
         wpan_phy_put(phy);
 
         return ieee802154_nl_reply(msg, info);
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c
index f96bae8fd330..50e823927d49 100644
--- a/net/ieee802154/raw.c
+++ b/net/ieee802154/raw.c
@@ -106,7 +106,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        size_t size)
 {
         struct net_device *dev;
-        unsigned mtu;
+        unsigned int mtu;
         struct sk_buff *skb;
         int hlen, tlen;
         int err;