diff options
| author | Nick Bowler <nbowler@elliptictech.com> | 2011-11-08 12:12:45 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 17:24:51 -0800 |
| commit | c0ab420c6822529fa5aba05668e1e983b065460f (patch) | |
| tree | 8e8e2be923a3587c3847a98332998f89abdd0da8 /net/ipv6 | |
| parent | d253520a7b2c2223fb4f704f06d10f2c547bdeef (diff) | |
| download | kernel_samsung_tuna-c0ab420c6822529fa5aba05668e1e983b065460f.zip kernel_samsung_tuna-c0ab420c6822529fa5aba05668e1e983b065460f.tar.gz kernel_samsung_tuna-c0ab420c6822529fa5aba05668e1e983b065460f.tar.bz2 | |
ah: Read nexthdr value before overwriting it in ahash input callback.
commit b7ea81a58adc123a4e980cb0eff9eb5c144b5dc7 upstream.
The AH4/6 ahash input callbacks read out the nexthdr field from the AH
header *after* they overwrite that header. This is obviously not going
to end well. Fix it up.
Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ah6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index ede4d9d..7a33aaa 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -464,12 +464,12 @@ static void ah6_input_done(struct crypto_async_request *base, int err) if (err) goto out; + err = ah->nexthdr; + skb->network_header += ah_hlen; memcpy(skb_network_header(skb), work_iph, hdr_len); __skb_pull(skb, ah_hlen + hdr_len); skb_set_transport_header(skb, -hdr_len); - - err = ah->nexthdr; out: kfree(AH_SKB_CB(skb)->tmp); xfrm_input_resume(skb, err); |