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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec 



Steffen Klassert says:

====================
pull request (net): ipsec 2021-03-31

1) Fix ipv4 pmtu checks for xfrm anf vti interfaces.
   From Eyal Birger.

2) There are situations where the socket passed to
   xfrm_output_resume() is not the same as the one
   attached to the skb. Use the socket passed to
   xfrm_output_resume() to avoid lookup failures
   when xfrm is used with VRFs.
   From Evan Nimmo.

3) Make the xfrm_state_hash_generation sequence counter per
   network namespace because but its write serialization
   lock is also per network namespace. Write protection
   is insufficient otherwise.
   From Ahmed S. Darwish.

4) Fixup sctp featue flags when used with esp offload.
   From Xin Long.

5) xfrm BEET mode doesn't support fragments for inner packets.
   This is a limitation of the protocol, so no fix possible.
   Warn at least to notify the user about that situation.
   From Xin Long.

6) Fix NULL pointer dereference on policy lookup when
   namespaces are uses in combination with esp offload.

7) Fix incorrect transformation on esp offload when
   packets get segmented at layer 3.

8) Fix some user triggered usages of WARN_ONCE in
   the xfrm compat layer.
   From Dmitry Safonov.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bdc2ab5c ef19e111

include/net/netns/xfrm.h

+3 −1
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ struct netns_xfrm { 
	struct dst_ops		xfrm6_dst_ops;

#endif

	spinlock_t		xfrm_state_lock;

	seqcount_spinlock_t	xfrm_state_hash_generation;



	spinlock_t xfrm_policy_lock;

	struct mutex xfrm_cfg_mutex;

};

include/net/xfrm.h

+2 −2
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir, 
		return __xfrm_policy_check(sk, ndir, skb, family);



	return	(!net->xfrm.policy_count[dir] && !secpath_exists(skb)) ||

		(skb_dst(skb)->flags & DST_NOPOLICY) ||

		(skb_dst(skb) && (skb_dst(skb)->flags & DST_NOPOLICY)) ||

		__xfrm_policy_check(sk, ndir, skb, family);

}
@@ -1557,7 +1557,7 @@ int xfrm_trans_queue_net(struct net *net, struct sk_buff *skb, 
int xfrm_trans_queue(struct sk_buff *skb,

		     int (*finish)(struct net *, struct sock *,

				   struct sk_buff *));

int xfrm_output_resume(struct sk_buff *skb, int err);

int xfrm_output_resume(struct sock *sk, struct sk_buff *skb, int err);

int xfrm_output(struct sock *sk, struct sk_buff *skb);



#if IS_ENABLED(CONFIG_NET_PKTGEN)

net/ipv4/ah4.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void ah_output_done(struct crypto_async_request *base, int err) 
	}



	kfree(AH_SKB_CB(skb)->tmp);

	xfrm_output_resume(skb, err);

	xfrm_output_resume(skb->sk, skb, err);

}



static int ah_output(struct xfrm_state *x, struct sk_buff *skb)

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void esp_output_done(struct crypto_async_request *base, int err) 
		    x->encap && x->encap->encap_type == TCP_ENCAP_ESPINTCP)

			esp_output_tail_tcp(x, skb);

		else

			xfrm_output_resume(skb, err);

			xfrm_output_resume(skb->sk, skb, err);

	}

}

net/ipv4/esp4_offload.c

+14 −3
Original line number Diff line number Diff line
@@ -217,10 +217,12 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb, 


	if ((!(skb->dev->gso_partial_features & NETIF_F_HW_ESP) &&

	     !(features & NETIF_F_HW_ESP)) || x->xso.dev != skb->dev)

		esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);

		esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK |

					    NETIF_F_SCTP_CRC);

	else if (!(features & NETIF_F_HW_ESP_TX_CSUM) &&

		 !(skb->dev->gso_partial_features & NETIF_F_HW_ESP_TX_CSUM))

		esp_features = features & ~NETIF_F_CSUM_MASK;

		esp_features = features & ~(NETIF_F_CSUM_MASK |

					    NETIF_F_SCTP_CRC);



	xo->flags |= XFRM_GSO_SEGMENT;
@@ -312,8 +314,17 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_ 
	ip_hdr(skb)->tot_len = htons(skb->len);

	ip_send_check(ip_hdr(skb));



	if (hw_offload)

	if (hw_offload) {

		if (!skb_ext_add(skb, SKB_EXT_SEC_PATH))

			return -ENOMEM;



		xo = xfrm_offload(skb);

		if (!xo)

			return -EINVAL;



		xo->flags |= XFRM_XMIT;

		return 0;

	}



	err = esp_output_tail(x, skb, &esp);

	if (err)