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

[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

net/ipv4/ah4.c

+1 −3
Original line number Diff line number Diff line
@@ -179,11 +179,9 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) 
		err = ah_mac_digest(ahp, skb, ah->auth_data);

		if (err)

			goto unlock;

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))

			err = -EBADMSG;

	}

	}

unlock:

	spin_unlock(&x->lock);

net/ipv4/esp4.c

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
			BUG();



		if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP);

			err = -EBADMSG;

			goto unlock;

		}

net/ipv6/ah6.c

+1 −3
Original line number Diff line number Diff line
@@ -380,11 +380,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 unlock;

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))

			err = -EBADMSG;

	}

	}

unlock:

	spin_unlock(&x->lock);

net/ipv6/esp6.c

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) 
			BUG();



		if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP);

			ret = -EBADMSG;

			goto unlock;

		}

net/xfrm/xfrm_input.c

+4 −1
Original line number Diff line number Diff line
@@ -186,8 +186,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 
resume:

		spin_lock(&x->lock);

		if (nexthdr <= 0) {

			if (nexthdr == -EBADMSG)

			if (nexthdr == -EBADMSG) {

				xfrm_audit_state_icvfail(x, skb,

							 x->type->proto);

				x->stats.integrity_failed++;

			}

			XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEPROTOERROR);

			goto drop_unlock;

		}