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

Commit b00897b8 authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

xfrm4: Don't call icmp_send on local error 



Calling icmp_send() on a local message size error leads to
an incorrect update of the path mtu. So use ip_local_error()
instead to notify the socket about the error.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c146066a

net/ipv4/xfrm4_output.c

+6 −1
Original line number Diff line number Diff line
@@ -32,7 +32,12 @@ static int xfrm4_tunnel_check_size(struct sk_buff *skb) 
	dst = skb_dst(skb);

	mtu = dst_mtu(dst);

	if (skb->len > mtu) {

		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));

		if (skb->sk)

			ip_local_error(skb->sk, EMSGSIZE, ip_hdr(skb)->daddr,

				       inet_sk(skb->sk)->inet_dport, mtu);

		else

			icmp_send(skb, ICMP_DEST_UNREACH,

				  ICMP_FRAG_NEEDED, htonl(mtu));

		ret = -EMSGSIZE;

	}

out: