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_red.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_red.c')
-rw-r--r-- | net/sched/sch_red.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index a5cc3012cf42..633e32defdcc 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c | |||
@@ -272,8 +272,9 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb) | |||
272 | opts = nla_nest_start(skb, TCA_OPTIONS); | 272 | opts = nla_nest_start(skb, TCA_OPTIONS); |
273 | if (opts == NULL) | 273 | if (opts == NULL) |
274 | goto nla_put_failure; | 274 | goto nla_put_failure; |
275 | NLA_PUT(skb, TCA_RED_PARMS, sizeof(opt), &opt); | 275 | if (nla_put(skb, TCA_RED_PARMS, sizeof(opt), &opt) || |
276 | NLA_PUT_U32(skb, TCA_RED_MAX_P, q->parms.max_P); | 276 | nla_put_u32(skb, TCA_RED_MAX_P, q->parms.max_P)) |
277 | goto nla_put_failure; | ||
277 | return nla_nest_end(skb, opts); | 278 | return nla_nest_end(skb, opts); |
278 | 279 | ||
279 | nla_put_failure: | 280 | nla_put_failure: |