Patchwork sch_sfb: Fix missing NULL check

login
register
mail settings
Submitter Alan Cox
Date July 12, 2012, 1:39 p.m.
Message ID <20120712133847.18719.77998.stgit@localhost.localdomain>
Download mbox | patch
Permalink /patch/170656/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - July 12, 2012, 1:25 p.m.
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Thu, 12 Jul 2012 14:39:11 +0100

> Signed-off-by: Alan Cox <alna@linux.intel.com>
                           ^^^^

I'm truly astonished that you type in signoffs by hand Alan.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alan Cox - July 12, 2012, 1:39 p.m.
From: Alan Cox <alan@linux.intel.com>

Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44461
Signed-off-by: Alan Cox <alna@linux.intel.com>
---

 net/sched/sch_sfb.c |    2 ++
 1 file changed, 2 insertions(+)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet - July 12, 2012, 1:50 p.m.
On Thu, 2012-07-12 at 06:25 -0700, David Miller wrote:
> From: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Date: Thu, 12 Jul 2012 14:39:11 +0100
> 
> > Signed-off-by: Alan Cox <alna@linux.intel.com>
>                            ^^^^
> 
> I'm truly astonished that you type in signoffs by hand Alan.

Weel, I do the same ;)

Feel free to add my

Acked-by: Eric Dumazet <edumazet@google.com>



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - July 12, 2012, 3:33 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 12 Jul 2012 15:50:21 +0200

> On Thu, 2012-07-12 at 06:25 -0700, David Miller wrote:
>> From: Alan Cox <alan@lxorguk.ukuu.org.uk>
>> Date: Thu, 12 Jul 2012 14:39:11 +0100
>> 
>> > Signed-off-by: Alan Cox <alna@linux.intel.com>
>>                            ^^^^
>> 
>> I'm truly astonished that you type in signoffs by hand Alan.
> 
> Weel, I do the same ;)

You guys are weird :-)

> Feel free to add my
> 
> Acked-by: Eric Dumazet <edumazet@google.com>

Applied, with signoff typo fixed too :-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index 74305c8..30ea467 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -570,6 +570,8 @@  static int sfb_dump(struct Qdisc *sch, struct sk_buff *skb)
 
 	sch->qstats.backlog = q->qdisc->qstats.backlog;
 	opts = nla_nest_start(skb, TCA_OPTIONS);
+	if (opts == NULL)
+		goto nla_put_failure;
 	if (nla_put(skb, TCA_SFB_PARMS, sizeof(opt), &opt))
 		goto nla_put_failure;
 	return nla_nest_end(skb, opts);