pkt_sched: 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, 8 insertions, 6 deletions

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 60f8f616e8fa..0beba0e5312e 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -267,15 +267,17 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int
         c.refcnt = ipt->tcf_refcnt - ref;
         strcpy(t->u.user.name, ipt->tcfi_t->u.kernel.target->name);
 
-        NLA_PUT(skb, TCA_IPT_TARG, ipt->tcfi_t->u.user.target_size, t);
-        NLA_PUT_U32(skb, TCA_IPT_INDEX, ipt->tcf_index);
-        NLA_PUT_U32(skb, TCA_IPT_HOOK, ipt->tcfi_hook);
-        NLA_PUT(skb, TCA_IPT_CNT, sizeof(struct tc_cnt), &c);
-        NLA_PUT_STRING(skb, TCA_IPT_TABLE, ipt->tcfi_tname);
+        if (nla_put(skb, TCA_IPT_TARG, ipt->tcfi_t->u.user.target_size, t) ||
+            nla_put_u32(skb, TCA_IPT_INDEX, ipt->tcf_index) ||
+            nla_put_u32(skb, TCA_IPT_HOOK, ipt->tcfi_hook) ||
+            nla_put(skb, TCA_IPT_CNT, sizeof(struct tc_cnt), &c) ||
+            nla_put_string(skb, TCA_IPT_TABLE, ipt->tcfi_tname))
+                goto nla_put_failure;
         tm.install = jiffies_to_clock_t(jiffies - ipt->tcf_tm.install);
         tm.lastuse = jiffies_to_clock_t(jiffies - ipt->tcf_tm.lastuse);
         tm.expires = jiffies_to_clock_t(ipt->tcf_tm.expires);
-        NLA_PUT(skb, TCA_IPT_TM, sizeof (tm), &tm);
+        if (nla_put(skb, TCA_IPT_TM, sizeof (tm), &tm))
+                goto nla_put_failure;
         kfree(t);
         return skb->len;