diff options
| author | Nick Bowler <nbowler@elliptictech.com> | 2011-11-10 09:01:27 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-12 18:13:32 -0500 |
| commit | 4b90a603a1b21d63cf743cc833680cb195a729f6 (patch) | |
| tree | 5ac1ffcfd7208796967f4d9387d831c1d9e54ace /net | |
| parent | 1e49570171117e547e6324c58371db4a0dc2f1db (diff) | |
| download | lwn-4b90a603a1b21d63cf743cc833680cb195a729f6.tar.gz lwn-4b90a603a1b21d63cf743cc833680cb195a729f6.zip | |
ah: Don't return NET_XMIT_DROP on input.
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ah4.c | 2 | ||||
| -rw-r--r-- | net/ipv6/ah6.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index c7056b2e831f..36d14406261e 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c @@ -369,8 +369,6 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) if (err == -EINPROGRESS) goto out; - if (err == -EBUSY) - err = NET_XMIT_DROP; goto out_free; } diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 7a33aaa00227..4c0f894d0843 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) if (err == -EINPROGRESS) goto out; - if (err == -EBUSY) - err = NET_XMIT_DROP; goto out_free; } |