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

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 73e0a3ab4d55..3922f2a2821b 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -172,12 +172,14 @@ static int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
         };
         struct tcf_t t;
 
-        NLA_PUT(skb, TCA_DEF_PARMS, sizeof(opt), &opt);
-        NLA_PUT_STRING(skb, TCA_DEF_DATA, d->tcfd_defdata);
+        if (nla_put(skb, TCA_DEF_PARMS, sizeof(opt), &opt) ||
+            nla_put_string(skb, TCA_DEF_DATA, d->tcfd_defdata))
+                goto nla_put_failure;
         t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
         t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
         t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
-        NLA_PUT(skb, TCA_DEF_TM, sizeof(t), &t);
+        if (nla_put(skb, TCA_DEF_TM, sizeof(t), &t))
+                goto nla_put_failure;
         return skb->len;
 
 nla_put_failure: