diff options
author | David S. Miller <davem@davemloft.net> | 2012-03-29 05:11:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-01 18:11:37 -0400 |
commit | 1b34ec43c9b3de44a5420841ab293d1b2035a94c (patch) | |
tree | 8d6cf966c813e0e61001655179b5ef8e5f1b54b3 /net/sched/act_nat.c | |
parent | 9360ffd1859720f6520cf59241909b74dae369d0 (diff) |
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>
Diffstat (limited to 'net/sched/act_nat.c')
-rw-r--r-- | net/sched/act_nat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c index 001d1b354869..b5d029eb44f2 100644 --- a/net/sched/act_nat.c +++ b/net/sched/act_nat.c | |||
@@ -284,11 +284,13 @@ static int tcf_nat_dump(struct sk_buff *skb, struct tc_action *a, | |||
284 | }; | 284 | }; |
285 | struct tcf_t t; | 285 | struct tcf_t t; |
286 | 286 | ||
287 | NLA_PUT(skb, TCA_NAT_PARMS, sizeof(opt), &opt); | 287 | if (nla_put(skb, TCA_NAT_PARMS, sizeof(opt), &opt)) |
288 | goto nla_put_failure; | ||
288 | t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install); | 289 | t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install); |
289 | t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse); | 290 | t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse); |
290 | t.expires = jiffies_to_clock_t(p->tcf_tm.expires); | 291 | t.expires = jiffies_to_clock_t(p->tcf_tm.expires); |
291 | NLA_PUT(skb, TCA_NAT_TM, sizeof(t), &t); | 292 | if (nla_put(skb, TCA_NAT_TM, sizeof(t), &t)) |
293 | goto nla_put_failure; | ||
292 | 294 | ||
293 | return skb->len; | 295 | return skb->len; |
294 | 296 | ||