[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110426211946.GO15903@stratus.com>
Date: Tue, 26 Apr 2011 17:19:46 -0400
From: Bandan Das <bandan.das@...atus.com>
To: Eric Dumazet <eric.dumazet@...il.com>
Cc: Bandan Das <bandan.das@...atus.com>,
David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
akpm@...ux-foundation.org, tom@...ervice.com
Subject: Re: [Bugme-new] [Bug 33842] New: NULL pointer dereference in
ip_fragment
> > Umm.. I could be wrong! I just did a quick grep for your name in the
> > 2.6.39-rc4 changelog :
> > http://www.kernel.org/pub/linux/kernel/v2.6/testing/ChangeLog-2.6.39-rc4
> >
> > and didn't find it there.
>
> Then it will be in rc5, dont worry ;)
>
>
Yeah, I just rechecked and this is already in Linus' tree. So, Tomas you can
either try pulling in those changes or you can apply this patch and see
if it makes any difference. Thanks!
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 008ff6c..f3bc322 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -249,11 +249,9 @@ static int br_parse_ip_options(struct sk_buff *skb)
goto drop;
}
- /* Zero out the CB buffer if no options present */
- if (iph->ihl == 5) {
- memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
+ memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
+ if (iph->ihl == 5)
return 0;
- }
opt->optlen = iph->ihl*4 - sizeof(struct iphdr);
if (ip_options_compile(dev_net(dev), opt, skb))
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists