diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-16 15:55:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:53:51 -0800 |
| commit | 668dc8af3150f837f7f0461001bbbc0ce25d7bdf (patch) | |
| tree | 9ba3534a190bb69b3aebf24aaa4340685fe16539 /net/ipv6 | |
| parent | b2aa5e9d43a38dcdfa0878ed750cf32f98460278 (diff) | |
| download | blackbird-op-linux-668dc8af3150f837f7f0461001bbbc0ce25d7bdf.tar.gz blackbird-op-linux-668dc8af3150f837f7f0461001bbbc0ce25d7bdf.zip | |
[IPSEC]: Move integrity stat collection into xfrm_input
Similar to the moving out of the replay processing on the output, this
patch moves the integrity stat collectin from x->type->input into
xfrm_input.
This would eventually allow transforms such as AH/ESP to be lockless.
The error value EBADMSG (currently unused in the crypto layer) is used
to indicate a failed integrity check. In future this error can be
directly returned by the crypto layer once we switch to aead
algorithms.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ah6.c | 3 | ||||
| -rw-r--r-- | net/ipv6/esp6.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 4eaf55072b1b..d4b59ecb0b57 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -379,10 +379,9 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) err = ah_mac_digest(ahp, skb, ah->auth_data); if (err) goto free_out; - err = -EINVAL; if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) { LIMIT_NETDEBUG(KERN_WARNING "ipsec ah authentication error\n"); - x->stats.integrity_failed++; + err = -EBADMSG; goto free_out; } } diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 444053254676..096974ba6420 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -177,8 +177,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) BUG(); if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { - x->stats.integrity_failed++; - ret = -EINVAL; + ret = -EBADMSG; goto out; } } |
