Commit e438edaa authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'ipsec-2023-06-20' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec 

ipsec-2023-06-20
parents 440d71e2 f015b900

include/net/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,7 @@ struct xfrm_offload { 
struct sec_path {

	int			len;

	int			olen;

	int			verified_cnt;



	struct xfrm_state	*xvec[XFRM_MAX_DEPTH];

	struct xfrm_offload	ovec[XFRM_MAX_OFFLOAD_DEPTH];

net/ipv4/esp4_offload.c

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_ 


	secpath_reset(skb);



	if (skb_needs_linearize(skb, skb->dev->features) &&

	    __skb_linearize(skb))

		return -ENOMEM;

	return 0;

}

net/ipv4/xfrm4_input.c

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) 
	kfree_skb(skb);

	return 0;

}

EXPORT_SYMBOL(xfrm4_udp_encap_rcv);



int xfrm4_rcv(struct sk_buff *skb)

{

net/ipv6/esp6_offload.c

+3 −0
Original line number Diff line number Diff line
@@ -374,6 +374,9 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features 


	secpath_reset(skb);



	if (skb_needs_linearize(skb, skb->dev->features) &&

	    __skb_linearize(skb))

		return -ENOMEM;

	return 0;

}

net/ipv6/xfrm6_input.c

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ int xfrm6_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) 
	__be32 *udpdata32;

	__u16 encap_type = up->encap_type;



	if (skb->protocol == htons(ETH_P_IP))

		return xfrm4_udp_encap_rcv(sk, skb);



	/* if this is not encapsulated socket, then just return now */

	if (!encap_type)

		return 1;