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_csum.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_csum.c')
-rw-r--r-- | net/sched/act_csum.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c index 453a73431ac4..882124ceb70c 100644 --- a/net/sched/act_csum.c +++ b/net/sched/act_csum.c | |||
@@ -550,11 +550,13 @@ static int tcf_csum_dump(struct sk_buff *skb, | |||
550 | }; | 550 | }; |
551 | struct tcf_t t; | 551 | struct tcf_t t; |
552 | 552 | ||
553 | NLA_PUT(skb, TCA_CSUM_PARMS, sizeof(opt), &opt); | 553 | if (nla_put(skb, TCA_CSUM_PARMS, sizeof(opt), &opt)) |
554 | goto nla_put_failure; | ||
554 | t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install); | 555 | t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install); |
555 | t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse); | 556 | t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse); |
556 | t.expires = jiffies_to_clock_t(p->tcf_tm.expires); | 557 | t.expires = jiffies_to_clock_t(p->tcf_tm.expires); |
557 | NLA_PUT(skb, TCA_CSUM_TM, sizeof(t), &t); | 558 | if (nla_put(skb, TCA_CSUM_TM, sizeof(t), &t)) |
559 | goto nla_put_failure; | ||
558 | 560 | ||
559 | return skb->len; | 561 | return skb->len; |
560 | 562 | ||