diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-31 00:10:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:00:10 -0500 |
commit | 9dd3245a2ac1834797191072705015e6a12f55bf (patch) | |
tree | b8f05a146de3729698ef7627e68251ee68a2a472 /net/ipv6 | |
parent | 0883ae0e5599656b5f3b0e9ce474e01dee7dfee4 (diff) |
[IPSEC]: Move all calls to xfrm_audit_state_icvfail to xfrm_input
Let's nip the code duplication in the bud :)
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 | 4 | ||||
-rw-r--r-- | net/ipv6/esp6.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 2d32772c87c3..fb0d07a15e93 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
@@ -380,10 +380,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) | |||
380 | err = ah_mac_digest(ahp, skb, ah->auth_data); | 380 | err = ah_mac_digest(ahp, skb, ah->auth_data); |
381 | if (err) | 381 | if (err) |
382 | goto unlock; | 382 | goto unlock; |
383 | if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) { | 383 | if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) |
384 | xfrm_audit_state_icvfail(x, skb, IPPROTO_AH); | ||
385 | err = -EBADMSG; | 384 | err = -EBADMSG; |
386 | } | ||
387 | } | 385 | } |
388 | unlock: | 386 | unlock: |
389 | spin_unlock(&x->lock); | 387 | spin_unlock(&x->lock); |
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index e10f10bfe2c9..5bd5292ad9fa 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -186,7 +186,6 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) | |||
186 | BUG(); | 186 | BUG(); |
187 | 187 | ||
188 | if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { | 188 | if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { |
189 | xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP); | ||
190 | ret = -EBADMSG; | 189 | ret = -EBADMSG; |
191 | goto unlock; | 190 | goto unlock; |
192 | } | 191 | } |