Commit 9dd3245a authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[IPSEC]: Move all calls to xfrm_audit_state_icvfail to xfrm_input

Let's nip the code duplication in the bud :)
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0883ae0e
...@@ -179,10 +179,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -179,10 +179,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
err = ah_mac_digest(ahp, skb, ah->auth_data); err = ah_mac_digest(ahp, skb, ah->auth_data);
if (err) if (err)
goto unlock; goto unlock;
if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) { if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))
xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);
err = -EBADMSG; err = -EBADMSG;
}
} }
unlock: unlock:
spin_unlock(&x->lock); spin_unlock(&x->lock);
......
...@@ -191,7 +191,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -191,7 +191,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
BUG(); BUG();
if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {
xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP);
err = -EBADMSG; err = -EBADMSG;
goto unlock; goto unlock;
} }
......
...@@ -380,10 +380,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -380,10 +380,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
err = ah_mac_digest(ahp, skb, ah->auth_data); err = ah_mac_digest(ahp, skb, ah->auth_data);
if (err) if (err)
goto unlock; goto unlock;
if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) { if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))
xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);
err = -EBADMSG; err = -EBADMSG;
}
} }
unlock: unlock:
spin_unlock(&x->lock); spin_unlock(&x->lock);
......
...@@ -186,7 +186,6 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -186,7 +186,6 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
BUG(); BUG();
if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) { if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {
xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP);
ret = -EBADMSG; ret = -EBADMSG;
goto unlock; goto unlock;
} }
......
...@@ -186,8 +186,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) ...@@ -186,8 +186,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
resume: resume:
spin_lock(&x->lock); spin_lock(&x->lock);
if (nexthdr <= 0) { if (nexthdr <= 0) {
if (nexthdr == -EBADMSG) if (nexthdr == -EBADMSG) {
xfrm_audit_state_icvfail(x, skb,
x->type->proto);
x->stats.integrity_failed++; x->stats.integrity_failed++;
}
XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEPROTOERROR); XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEPROTOERROR);
goto drop_unlock; goto drop_unlock;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment