Commit 7c2becf7 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-06-23

1) Don't return a mtu smaller than 1280 on IPv6 pmtu discovery.
   From Sabrina Dubroca

2) Fix seqcount rcu-read side in xfrm_policy_lookup_bytype
   for the PREEMPT_RT case. From Varad Gautam.

3) Remove a repeated declaration of xfrm_parse_spi.
   From Shaokun Zhang.

4) IPv4 beet mode can't handle fragments, but IPv6 does.
   commit 68dc022d ("xfrm: BEET mode doesn't support
   fragments for inner packets") handled IPv4 and IPv6
   the same way. Relax the check for IPv6 because fragments
   are possible here. From Xin Long.

5) Memory allocation failures are not reported for
   XFRMA_ENCAP and XFRMA_COADDR in xfrm_state_construct.
   Fix this by moving both cases in front of the function.

6) Fix a missing initialization in the xfrm offload fallback
   fail case for bonding devices. From Ayush Sawal.

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

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

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1546,6 +1546,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si); 
void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si);

u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq);

int xfrm_init_replay(struct xfrm_state *x);

u32 __xfrm_state_mtu(struct xfrm_state *x, int mtu);

u32 xfrm_state_mtu(struct xfrm_state *x, int mtu);

int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload);

int xfrm_init_state(struct xfrm_state *x);
@@ -1570,7 +1571,6 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi, 
		    int encap_type);

int xfrm4_transport_finish(struct sk_buff *skb, int async);

int xfrm4_rcv(struct sk_buff *skb);

int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq);



static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)

{

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);

		u32 padto;



		padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached));

		padto = min(x->tfcpad, __xfrm_state_mtu(x, dst->child_mtu_cached));

		if (skb->len < padto)

			esp.tfclen = padto - skb->len;

	}

net/ipv6/esp6.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) 
		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);

		u32 padto;



		padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached));

		padto = min(x->tfcpad, __xfrm_state_mtu(x, dst->child_mtu_cached));

		if (skb->len < padto)

			esp.tfclen = padto - skb->len;

	}

net/xfrm/xfrm_device.c

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, 
		xso->num_exthdrs = 0;

		xso->flags = 0;

		xso->dev = NULL;

		xso->real_dev = NULL;

		dev_put(dev);



		if (err != -EOPNOTSUPP)

net/xfrm/xfrm_output.c

+0 −7
Original line number Diff line number Diff line
@@ -711,15 +711,8 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb) 
static int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb)

{

#if IS_ENABLED(CONFIG_IPV6)

	unsigned int ptr = 0;

	int err;



	if (x->outer_mode.encap == XFRM_MODE_BEET &&

	    ipv6_find_hdr(skb, &ptr, NEXTHDR_FRAGMENT, NULL, NULL) >= 0) {

		net_warn_ratelimited("BEET mode doesn't support inner IPv6 fragments\n");

		return -EAFNOSUPPORT;

	}



	err = xfrm6_tunnel_check_size(skb);

	if (err)

		return err;