Commit fd1ac07f authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Steffen Klassert
Browse files

xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE) 



If IPsec is not configured, there is no reason to delay the inevitable.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 4361f5b6

include/net/xfrm.h

+0 −7
Original line number Diff line number Diff line
@@ -1613,13 +1613,6 @@ static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optv 
{

 	return -ENOPROTOOPT;

}



static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)

{

 	/* should not happen */

 	kfree_skb(skb);

	return 0;

}

#endif



struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,

net/ipv4/udp.c

+2 −0
Original line number Diff line number Diff line
@@ -2520,9 +2520,11 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname, 
	case UDP_ENCAP:

		switch (val) {

		case 0:

#ifdef CONFIG_XFRM

		case UDP_ENCAP_ESPINUDP:

		case UDP_ENCAP_ESPINUDP_NON_IKE:

			up->encap_rcv = xfrm4_udp_encap_rcv;

#endif

			/* FALLTHROUGH */

		case UDP_ENCAP_L2TPINUDP:

			up->encap_type = val;

CRA Git | Maintained and supported by SUSTech CRA and CCSE