aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorNick Bowler <nbowler@elliptictech.com>2011-11-08 12:12:44 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 17:24:51 -0800
commitd253520a7b2c2223fb4f704f06d10f2c547bdeef (patch)
tree5bfcb9bec089ba770b70011da319dcea23b9ac37 /net/ipv4
parent8039a47e67451b8efd6100c4a7f27829fc2d8edd (diff)
downloadkernel_samsung_smdk4412-d253520a7b2c2223fb4f704f06d10f2c547bdeef.zip
kernel_samsung_smdk4412-d253520a7b2c2223fb4f704f06d10f2c547bdeef.tar.gz
kernel_samsung_smdk4412-d253520a7b2c2223fb4f704f06d10f2c547bdeef.tar.bz2
ah: Correctly pass error codes in ahash output callback.
commit 069294e813ed5f27f82613b027609bcda5f1b914 upstream. The AH4/6 ahash output callbacks pass nexthdr to xfrm_output_resume instead of the error code. This appears to be a copy+paste error from the input case, where nexthdr is expected. This causes the driver to continuously add AH headers to the datagram until either an allocation fails and the packet is dropped or the ahash driver hits a synchronous fallback and the resulting monstrosity is transmitted. Correct this issue by simply passing the error code unadulterated. 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/ipv4')
-rw-r--r--net/ipv4/ah4.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index c1f4154..33ca186 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -136,8 +136,6 @@ static void ah_output_done(struct crypto_async_request *base, int err)
memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
}
- err = ah->nexthdr;
-
kfree(AH_SKB_CB(skb)->tmp);
xfrm_output_resume(skb, err);
}