diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-11-20 16:44:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 16:44:00 -0800 |
| commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
| tree | 546c2ff099b2757e75cf34ddace874f1220f740e /net/sched/sch_api.c | |
| parent | netdevice wanrouter: Convert directly reference of netdev->priv (diff) | |
| parent | Linux 2.6.28-rc6 (diff) | |
| download | linux-dev-6ab33d51713d6d60c7677c0d020910a8cb37e513.tar.xz linux-dev-6ab33d51713d6d60c7677c0d020910a8cb37e513.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
Diffstat (limited to 'net/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 5bcef13408c8..1ef25e6ee1f9 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -422,6 +422,8 @@ static int qdisc_dump_stab(struct sk_buff *skb, struct qdisc_size_table *stab) struct nlattr *nest; nest = nla_nest_start(skb, TCA_STAB); + if (nest == NULL) + goto nla_put_failure; NLA_PUT(skb, TCA_STAB_BASE, sizeof(stab->szopts), &stab->szopts); nla_nest_end(skb, nest); |