aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorNick Bowler <nbowler@elliptictech.com>2011-11-10 04:01:27 -0500
committerHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>2012-02-13 15:15:02 -0500
commit449757b6252a963010d9f678fa61849f97716c01 (patch)
treeb741dbe9ae0fb0a2c1b2429872fcea44ac70fadb /net/ipv6
parent739007b5417c057513e13379c66f273a010286e6 (diff)
ah: Don't return NET_XMIT_DROP on input.
BugLink: http://bugs.launchpad.net/bugs/926309 commit 4b90a603a1b21d63cf743cc833680cb195a729f6 upstream. When the ahash driver returns -EBUSY, AH4/6 input functions return NET_XMIT_DROP, presumably copied from the output code path. But returning transmit codes on input doesn't make a lot of sense. Since NET_XMIT_DROP is a positive int, this gets interpreted as the next header type (i.e., success). As that can only end badly, remove the check. Signed-off-by: Nick Bowler <nbowler@elliptictech.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ah6.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 7a33aaa0022..4c0f894d084 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -581,8 +581,6 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
581 if (err == -EINPROGRESS) 581 if (err == -EINPROGRESS)
582 goto out; 582 goto out;
583 583
584 if (err == -EBUSY)
585 err = NET_XMIT_DROP;
586 goto out_free; 584 goto out_free;
587 } 585 }
588 586