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_htb.c | |
| parent | 9360ffd1859720f6520cf59241909b74dae369d0 (diff) | |
| download | op-kernel-dev-1b34ec43c9b3de44a5420841ab293d1b2035a94c.zip op-kernel-dev-1b34ec43c9b3de44a5420841ab293d1b2035a94c.tar.gz | |
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_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 29b942c..2ea6f19 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1051,7 +1051,8 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) nest = nla_nest_start(skb, TCA_OPTIONS); if (nest == NULL) goto nla_put_failure; - NLA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt); + if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt)) + goto nla_put_failure; nla_nest_end(skb, nest); spin_unlock_bh(root_lock); @@ -1090,7 +1091,8 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, opt.quantum = cl->quantum; opt.prio = cl->prio; opt.level = cl->level; - NLA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt); + if (nla_put(skb, TCA_HTB_PARMS, sizeof(opt), &opt)) + goto nla_put_failure; nla_nest_end(skb, nest); spin_unlock_bh(root_lock); |
