diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-29 11:11:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-02 00:11:37 +0200 |
| commit | 1b34ec43c9b3de44a5420841ab293d1b2035a94c (patch) | |
| tree | 8d6cf966c813e0e61001655179b5ef8e5f1b54b3 /net/sched/sch_gred.c | |
| parent | wireless: Stop using NLA_PUT*(). (diff) | |
| download | linux-1b34ec43c9b3de44a5420841ab293d1b2035a94c.tar.xz linux-1b34ec43c9b3de44a5420841ab293d1b2035a94c.zip | |
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_gred.c')
| -rw-r--r-- | net/sched/sch_gred.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index 0b15236be7b6..55e3310edc94 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c @@ -521,14 +521,16 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb) opts = nla_nest_start(skb, TCA_OPTIONS); if (opts == NULL) goto nla_put_failure; - NLA_PUT(skb, TCA_GRED_DPS, sizeof(sopt), &sopt); + if (nla_put(skb, TCA_GRED_DPS, sizeof(sopt), &sopt)) + goto nla_put_failure; for (i = 0; i < MAX_DPs; i++) { struct gred_sched_data *q = table->tab[i]; max_p[i] = q ? q->parms.max_P : 0; } - NLA_PUT(skb, TCA_GRED_MAX_P, sizeof(max_p), max_p); + if (nla_put(skb, TCA_GRED_MAX_P, sizeof(max_p), max_p)) + goto nla_put_failure; parms = nla_nest_start(skb, TCA_GRED_PARMS); if (parms == NULL) |