From: Martin Willi <martin@strongswan.org>
Date: Thu, 4 Dec 2008 23:40:17 +0000 (-0800)
Subject: xfrm: Accept ESP packets regardless of UDP encapsulation mode
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e061b165c7f4ec5e2e160d990b49011b5b6e5c6a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

xfrm: Accept ESP packets regardless of UDP encapsulation mode

From: Martin Willi <martin@strongswan.org>

An IPsec node speaking IKEv2 MUST accept incoming UDP encapsulated
ESP packets, even if no NAT situation is detected. This is important
if MOBIKE is in use. Some implementation keep the encapsulation
mode if they move out of a NAT situation.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index b4a13178fb40..65bcf09251ef 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -167,11 +167,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 			goto drop_unlock;
 		}
 
-		if ((x->encap ? x->encap->encap_type : 0) != encap_type) {
-			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMISMATCH);
-			goto drop_unlock;
-		}
-
 		if (x->props.replay_window && xfrm_replay_check(x, skb, seq)) {
 			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATESEQERROR);
 			goto drop_unlock;