diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-25 13:52:56 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-25 13:52:56 +0000 |
| commit | 65d76f368295973a35d195c9b13053502a67b6bc (patch) | |
| tree | fa7d9204b2da01a9c53633dda789380cfcad38c6 /net/sched/sch_api.c | |
| parent | dba0a918722ee0f0ba3442575e4448c3ab622be4 (diff) | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| download | kernel_samsung_smdk4412-65d76f368295973a35d195c9b13053502a67b6bc.zip kernel_samsung_smdk4412-65d76f368295973a35d195c9b13053502a67b6bc.tar.gz kernel_samsung_smdk4412-65d76f368295973a35d195c9b13053502a67b6bc.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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 b16ad29..6ab4a2f 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -417,6 +417,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); |