ipv4: 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, 9 insertions, 11 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index d4fad5c77447..3ffaad0ef98f 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1267,17 +1267,15 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,
         ifm->ifa_scope = ifa->ifa_scope;
         ifm->ifa_index = ifa->ifa_dev->dev->ifindex;
 
-        if (ifa->ifa_address)
-                NLA_PUT_BE32(skb, IFA_ADDRESS, ifa->ifa_address);
-
-        if (ifa->ifa_local)
-                NLA_PUT_BE32(skb, IFA_LOCAL, ifa->ifa_local);
-
-        if (ifa->ifa_broadcast)
-                NLA_PUT_BE32(skb, IFA_BROADCAST, ifa->ifa_broadcast);
-
-        if (ifa->ifa_label[0])
-                NLA_PUT_STRING(skb, IFA_LABEL, ifa->ifa_label);
+        if ((ifa->ifa_address &&
+             nla_put_be32(skb, IFA_ADDRESS, ifa->ifa_address)) ||
+            (ifa->ifa_local &&
+             nla_put_be32(skb, IFA_LOCAL, ifa->ifa_local)) ||
+            (ifa->ifa_broadcast &&
+             nla_put_be32(skb, IFA_BROADCAST, ifa->ifa_broadcast)) ||
+            (ifa->ifa_label[0] &&
+             nla_put_string(skb, IFA_LABEL, ifa->ifa_label)))
+                goto nla_put_failure;
 
         return nlmsg_end(skb, nlh);