phonet: 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, 5 insertions, 3 deletions

diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
index d61f6761777d..cfdf135fcd69 100644
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -116,7 +116,8 @@ static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr,
         ifm->ifa_flags = IFA_F_PERMANENT;
         ifm->ifa_scope = RT_SCOPE_LINK;
         ifm->ifa_index = dev->ifindex;
-        NLA_PUT_U8(skb, IFA_LOCAL, addr);
+        if (nla_put_u8(skb, IFA_LOCAL, addr))
+                goto nla_put_failure;
         return nlmsg_end(skb, nlh);
 
 nla_put_failure:
@@ -183,8 +184,9 @@ static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst,
         rtm->rtm_scope = RT_SCOPE_UNIVERSE;
         rtm->rtm_type = RTN_UNICAST;
         rtm->rtm_flags = 0;
-        NLA_PUT_U8(skb, RTA_DST, dst);
-        NLA_PUT_U32(skb, RTA_OIF, dev->ifindex);
+        if (nla_put_u8(skb, RTA_DST, dst) ||
+            nla_put_u32(skb, RTA_OIF, dev->ifindex))
+                goto nla_put_failure;
         return nlmsg_end(skb, nlh);
 
 nla_put_failure: