decnet: 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>

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 74d321a60e7b5751901c2a2e7d185e54043185ec..16efcda2f060cc73814a0462e1d300d8eeb690e7 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -695,13 +695,13 @@ static int dn_nl_fill_ifaddr(struct sk_buff *skb, struct dn_ifaddr *ifa,
        ifm->ifa_scope = ifa->ifa_scope;
        ifm->ifa_index = ifa->ifa_dev->dev->ifindex;
 
-       if (ifa->ifa_address)
-               NLA_PUT_LE16(skb, IFA_ADDRESS, ifa->ifa_address);
-       if (ifa->ifa_local)
-               NLA_PUT_LE16(skb, IFA_LOCAL, ifa->ifa_local);
-       if (ifa->ifa_label[0])
-               NLA_PUT_STRING(skb, IFA_LABEL, ifa->ifa_label);
-
+       if ((ifa->ifa_address &&
+            nla_put_le16(skb, IFA_ADDRESS, ifa->ifa_address)) ||
+           (ifa->ifa_local &&
+            nla_put_le16(skb, IFA_LOCAL, ifa->ifa_local)) ||
+           (ifa->ifa_label[0] &&
+            nla_put_string(skb, IFA_LABEL, ifa->ifa_label)))
+               goto nla_put_failure;
        return nlmsg_end(skb, nlh);
 
 nla_put_failure:

diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index f65c9ddaee41cde5bdc2ba5780ea8f4cf40928f3..7399e3d519225763774e46a4afdaab1bf9408d9d 100644 (file)
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -204,11 +204,11 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
        frh->src_len = r->src_len;
        frh->tos = 0;
 
-       if (r->dst_len)
-               NLA_PUT_LE16(skb, FRA_DST, r->dst);
-       if (r->src_len)
-               NLA_PUT_LE16(skb, FRA_SRC, r->src);
-
+       if ((r->dst_len &&
+            nla_put_le16(skb, FRA_DST, r->dst)) ||
+           (r->src_len &&
+            nla_put_le16(skb, FRA_SRC, r->src)))
+               goto nla_put_failure;
        return 0;
 
 nla_put_failure: