fix-slab-corruption-running-ip6sic.patch

fix-slab-corruption-running-ip6sic.patch

[Andrew Morton]

I have this floating about in my tree.  Is it of any interest?



From: Jarek Poplawski <jarkao2@o2.pl>

* Herbert Xu (herbert@gondor.apana.org.au) wrote:
> Jarek Poplawski <jarkao2@o2.pl> wrote:
> >
> > My proposal is: maybe Eric could change this in
> > xfrm6_tunnel_rcv() from xfrm6_tunnel.c e.g. like this:
> >
> > return xfrm6_rcv_spi(skb, spi) > 0 ? : 0;
> >
> > and, if no errors in testing, he could resubmit this patch?
>
> I agree, this is the right fix.

The fix proposed by Jarek indeed fixes the problem, tested on two boxes,
with an -rc5 kernel and a yesterdays git

Acked-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/ipv6/xfrm6_tunnel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN net/ipv6/xfrm6_tunnel.c~fix-slab-corruption-running-ip6sic net/ipv6/xfrm6_tunnel.c
--- a/net/ipv6/xfrm6_tunnel.c~fix-slab-corruption-running-ip6sic
+++ a/net/ipv6/xfrm6_tunnel.c
@@ -261,7 +261,7 @@ static int xfrm6_tunnel_rcv(struct sk_bu
 	__be32 spi;
 
 	spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
-	return xfrm6_rcv_spi(skb, spi);
+	return xfrm6_rcv_spi(skb, spi) > 0 ? : 0;
 }
 
 static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
_

Re: fix-slab-corruption-running-ip6sic.patch

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 26 Apr 2007 14:11:33 -0700

> 
> I have this floating about in my tree.  Is it of any interest?

I have it too, it's in my backlog which I'm not processing
because I'm trying to fix up how we screwed up both networking
"security" fixes by adding a new regression with each one :-)

Re: fix-slab-corruption-running-ip6sic.patch

[Jarek Poplawski]

On Thu, Apr 26, 2007 at 02:11:33PM -0700, Andrew Morton wrote:
> 
> I have this floating about in my tree.  Is it of any interest?
> 
> 
> 
> From: Jarek Poplawski <jarkao2@o2.pl>

I know you've more interesting problems, but I'd like to
straighten something: this is not my patch!

Please, change this to:

From: Eric Sesterhenn <snakebyte@gmx.de>

> 
> * Herbert Xu (herbert@gondor.apana.org.au) wrote:
> > Jarek Poplawski <jarkao2@o2.pl> wrote:
> > >
> > > My proposal is: maybe Eric could change this in
> > > xfrm6_tunnel_rcv() from xfrm6_tunnel.c e.g. like this:
> > >
> > > return xfrm6_rcv_spi(skb, spi) > 0 ? : 0;
> > >
> > > and, if no errors in testing, he could resubmit this patch?
> >
> > I agree, this is the right fix.
> 
> The fix proposed by Jarek indeed fixes the problem, tested on two boxes,
> with an -rc5 kernel and a yesterdays git
> 
> Acked-by: Eric Sesterhenn <snakebyte@gmx.de>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---

Thanks,
Jarek P.

PS: And this one time it's not a joke... I really mean it.

Re: fix-slab-corruption-running-ip6sic.patch

[David Miller]

From: Jarek Poplawski <jarkao2@o2.pl>
Date: Fri, 27 Apr 2007 09:18:59 +0200

> On Thu, Apr 26, 2007 at 02:11:33PM -0700, Andrew Morton wrote:
> > 
> > I have this floating about in my tree.  Is it of any interest?
> > 
> > 
> > 
> > From: Jarek Poplawski <jarkao2@o2.pl>
> 
> I know you've more interesting problems, but I'd like to
> straighten something: this is not my patch!
> 
> Please, change this to:
> 
> From: Eric Sesterhenn <snakebyte@gmx.de>

Patch applied, thanks everyone.