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

Commit e36d3ff9 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

udp6: respect IPV6_DONTFRAG sockopt in case there are pending frames 



if up->pending != 0 dontfrag is left with default value -1. That
causes that application that do:
sendto len>mtu flag MSG_MORE
sendto len>mtu flag 0
will receive EMSGSIZE errno as the result of the second sendto.

This patch fixes it by respecting IPV6_DONTFRAG socket option.

introduced by:
commit 4b340ae2 "IPv6: Complete IPV6_DONTFRAG support"

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2e5ddcc

net/ipv6/udp.c

+2 −3
Original line number Diff line number Diff line
@@ -1225,9 +1225,6 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	if (tclass < 0)

		tclass = np->tclass;



	if (dontfrag < 0)

		dontfrag = np->dontfrag;



	if (msg->msg_flags&MSG_CONFIRM)

		goto do_confirm;

back_from_confirm:
@@ -1246,6 +1243,8 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	up->pending = AF_INET6;



do_append_data:

	if (dontfrag < 0)

		dontfrag = np->dontfrag;

	up->len += ulen;

	getfrag  =  is_udplite ?  udplite_getfrag : ip_generic_getfrag;

	err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen,