ipv6: Stop using NLA_PUT*().

These macros contain a hidden goto, and are thus extremely error
prone and make code hard to audit.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 17 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 6a3bb6077e19..153060f946e0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3989,14 +3989,14 @@ static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev)
         struct nlattr *nla;
         struct ifla_cacheinfo ci;
 
-        NLA_PUT_U32(skb, IFLA_INET6_FLAGS, idev->if_flags);
-
+        if (nla_put_u32(skb, IFLA_INET6_FLAGS, idev->if_flags))
+                goto nla_put_failure;
         ci.max_reasm_len = IPV6_MAXPLEN;
         ci.tstamp = cstamp_delta(idev->tstamp);
         ci.reachable_time = jiffies_to_msecs(idev->nd_parms->reachable_time);
         ci.retrans_time = jiffies_to_msecs(idev->nd_parms->retrans_time);
-        NLA_PUT(skb, IFLA_INET6_CACHEINFO, sizeof(ci), &ci);
-
+        if (nla_put(skb, IFLA_INET6_CACHEINFO, sizeof(ci), &ci))
+                goto nla_put_failure;
         nla = nla_reserve(skb, IFLA_INET6_CONF, DEVCONF_MAX * sizeof(s32));
         if (nla == NULL)
                 goto nla_put_failure;
@@ -4061,15 +4061,13 @@ static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
         hdr->ifi_flags = dev_get_flags(dev);
         hdr->ifi_change = 0;
 
-        NLA_PUT_STRING(skb, IFLA_IFNAME, dev->name);
-
-        if (dev->addr_len)
-                NLA_PUT(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr);
-
-        NLA_PUT_U32(skb, IFLA_MTU, dev->mtu);
-        if (dev->ifindex != dev->iflink)
-                NLA_PUT_U32(skb, IFLA_LINK, dev->iflink);
-
+        if (nla_put_string(skb, IFLA_IFNAME, dev->name) ||
+            (dev->addr_len &&
+             nla_put(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr)) ||
+            nla_put_u32(skb, IFLA_MTU, dev->mtu) ||
+            (dev->ifindex != dev->iflink &&
+             nla_put_u32(skb, IFLA_LINK, dev->iflink)))
+                goto nla_put_failure;
         protoinfo = nla_nest_start(skb, IFLA_PROTINFO);
         if (protoinfo == NULL)
                 goto nla_put_failure;
@@ -4182,12 +4180,12 @@ static int inet6_fill_prefix(struct sk_buff *skb, struct inet6_dev *idev,
         if (pinfo->autoconf)
                 pmsg->prefix_flags |= IF_PREFIX_AUTOCONF;
 
-        NLA_PUT(skb, PREFIX_ADDRESS, sizeof(pinfo->prefix), &pinfo->prefix);
-
+        if (nla_put(skb, PREFIX_ADDRESS, sizeof(pinfo->prefix), &pinfo->prefix))
+                goto nla_put_failure;
         ci.preferred_time = ntohl(pinfo->prefered);
         ci.valid_time = ntohl(pinfo->valid);
-        NLA_PUT(skb, PREFIX_CACHEINFO, sizeof(ci), &ci);
-
+        if (nla_put(skb, PREFIX_CACHEINFO, sizeof(ci), &ci))
+                goto nla_put_failure;
         return nlmsg_end(skb, nlh);
 
 nla_put_failure: