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/ipv4 | |
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/ipv4')
-rw-r--r-- | net/ipv4/ah4.c | 4 | ||||
-rw-r--r-- | net/ipv4/esp4.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index ec8de0aa20ec..d76803a3dcae 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
@@ -179,10 +179,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) | |||
179 | err = ah_mac_digest(ahp, skb, ah->auth_data); | 179 | err = ah_mac_digest(ahp, skb, ah->auth_data); |
180 | if (err) | 180 | if (err) |
181 | goto unlock; | 181 | goto unlock; |
182 | if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) { | 182 | if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) |
183 | xfrm_audit_state_icvfail(x, skb, IPPROTO_AH); | ||
184 | err = -EBADMSG; | 183 | err = -EBADMSG; |
185 | } | ||
186 | } | 184 | } |
187 | unlock: | 185 | unlock: |
188 | spin_unlock(&x->lock); | 186 | spin_unlock(&x->lock); |
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index b334c7619c08..28ea5c77ca23 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
@@ -191,7 +191,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) | |||
191 | BUG(); | 191 | BUG(); |
192 | 192 | ||
193 | if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { | 193 | if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { |
194 | xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP); | ||
195 | err = -EBADMSG; | 194 | err = -EBADMSG; |
196 | goto unlock; | 195 | goto unlock; |
197 | } | 196 | } |