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/sch_choke.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/sch_choke.c')
-rw-r--r-- | net/sched/sch_choke.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c index 7e267d7b9c7..81445cc8196 100644 --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c | |||
@@ -515,8 +515,9 @@ static int choke_dump(struct Qdisc *sch, struct sk_buff *skb) | |||
515 | if (opts == NULL) | 515 | if (opts == NULL) |
516 | goto nla_put_failure; | 516 | goto nla_put_failure; |
517 | 517 | ||
518 | NLA_PUT(skb, TCA_CHOKE_PARMS, sizeof(opt), &opt); | 518 | if (nla_put(skb, TCA_CHOKE_PARMS, sizeof(opt), &opt) || |
519 | NLA_PUT_U32(skb, TCA_CHOKE_MAX_P, q->parms.max_P); | 519 | nla_put_u32(skb, TCA_CHOKE_MAX_P, q->parms.max_P)) |
520 | goto nla_put_failure; | ||
520 | return nla_nest_end(skb, opts); | 521 | return nla_nest_end(skb, opts); |
521 | 522 | ||
522 | nla_put_failure: | 523 | nla_put_failure: |