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

Commit 987905de authored by Mitsuru KANDA's avatar Mitsuru KANDA Committed by David S. Miller
Browse files

[IPV6]: Check connect(2) status for IPv6 UDP socket (Re: xfrm_lookup) 



I think we should cache the per-socket route(dst_entry) only when the
IPv6 UDP socket is connect(2)'ed.
(which is same as IPv4 UDP send behavior)

Signed-off-by: default avatarMitsuru KANDA <mk@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40abc270

net/ipv6/udp.c

+8 −2
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	int tclass = -1;

	int corkreq = up->corkflag || msg->msg_flags&MSG_MORE;

	int err;

	int connected = 0;



	/* destination address check */

	if (sin6) {
@@ -748,6 +749,7 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
		fl->fl_ip_dport = inet->dport;

		daddr = &np->daddr;

		fl->fl6_flowlabel = np->flow_label;

		connected = 1;

	}



	if (!fl->oif)
@@ -770,6 +772,7 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
		}

		if (!(opt->opt_nflen|opt->opt_flen))

			opt = NULL;

		connected = 0;

	}

	if (opt == NULL)

		opt = np->opt;
@@ -787,10 +790,13 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
		ipv6_addr_copy(&final, &fl->fl6_dst);

		ipv6_addr_copy(&fl->fl6_dst, rt0->addr);

		final_p = &final;

		connected = 0;

	}



	if (!fl->oif && ipv6_addr_is_multicast(&fl->fl6_dst))

	if (!fl->oif && ipv6_addr_is_multicast(&fl->fl6_dst)) {

		fl->oif = np->mcast_oif;

		connected = 0;

	}



	err = ip6_dst_lookup(sk, &dst, fl);

	if (err)
@@ -846,7 +852,7 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	else if (!corkreq)

		err = udp_v6_push_pending_frames(sk, up);



	if (dst)

	if (dst && connected)

		ip6_dst_store(sk, dst,

			      ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?

			      &np->daddr : NULL);