Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115243f0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6""

parents 8b6fc8ae 09c66295

include/net/xfrm.h

+0 −1
Original line number Diff line number Diff line
@@ -1543,7 +1543,6 @@ 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);

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,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
@@ -440,7 +440,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_state.c

+2 −12
Original line number Diff line number Diff line
@@ -2517,7 +2517,7 @@ void xfrm_state_delete_tunnel(struct xfrm_state *x) 
}

EXPORT_SYMBOL(xfrm_state_delete_tunnel);



u32 __xfrm_state_mtu(struct xfrm_state *x, int mtu)

u32 xfrm_state_mtu(struct xfrm_state *x, int mtu)

{

	const struct xfrm_type *type = READ_ONCE(x->type);

	struct crypto_aead *aead;
@@ -2548,17 +2548,7 @@ u32 __xfrm_state_mtu(struct xfrm_state *x, int mtu) 
	return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -

		 net_adj) & ~(blksize - 1)) + net_adj - 2;

}

EXPORT_SYMBOL_GPL(__xfrm_state_mtu);



u32 xfrm_state_mtu(struct xfrm_state *x, int mtu)

{

	mtu = __xfrm_state_mtu(x, mtu);



	if (x->props.family == AF_INET6 && mtu < IPV6_MIN_MTU)

		return IPV6_MIN_MTU;



	return mtu;

}

EXPORT_SYMBOL_GPL(xfrm_state_mtu);



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

{