Revert "xfrm: Accept ESP packets regardless of UDP encapsulation mode"

This reverts commit e061b16. Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Dec 19, 2008 · 3de77cf · 3de77cf
1 parent 49ad959
commit 3de77cf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
@@ -167,6 +167,11 @@ 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;