]> git.karo-electronics.de Git - karo-tx-linux.git/commit
IPCOMP: Fetch nexthdr before ipch is destroyed
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 15 Feb 2008 09:44:03 +0000 (01:44 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 26 Feb 2008 00:18:37 +0000 (16:18 -0800)
commit363c11d7e1c2b2cc30e33416a518cea5ef9e0cc8
treec29c98f96892976ffa27427675662476eeca1efa
parentcefe34bea77e194fd6b6a7a062e1620af2eef69f
IPCOMP: Fetch nexthdr before ipch is destroyed

Upstream commit: 2614fa59fa805cd488083c5602eb48533cdbc018

When I moved the nexthdr setting out of IPComp I accidently moved
the reading of ipch->nexthdr after the decompression.  Unfortunately
this means that we'd be reading from a stale ipch pointer which
doesn't work very well.

This patch moves the reading up so that we get the correct nexthdr
value.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/ipcomp.c
net/ipv6/ipcomp6.c