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

Commit 85cb73ff authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

net: ipv6: reset daddr and dport in sk if connect() fails 



In __ip6_datagram_connect(), reset sk->sk_v6_daddr and inet->dport if
error occurs.
In udp_v6_early_demux(), check for sk_state to make sure it is in
TCP_ESTABLISHED state.
Together, it makes sure unconnected UDP socket won't be considered as a
valid candidate for early demux.

v3: add TCP_ESTABLISHED state check in udp_v6_early_demux()
v2: fix compilation error

Fixes: 5425077d ("net: ipv6: Add early demux handler for UDP unicast")
Signed-off-by: default avatarWei Wang <weiwan@google.com>
Acked-by: default avatarMaciej Żenczykowski <maze@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0c32a16

net/ipv6/datagram.c

+7 −1
Original line number Diff line number Diff line
@@ -250,8 +250,14 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, 
	 */



	err = ip6_datagram_dst_update(sk, true);

	if (err)

	if (err) {

		/* Reset daddr and dport so that udp_v6_early_demux()

		 * fails to find this socket

		 */

		memset(&sk->sk_v6_daddr, 0, sizeof(sk->sk_v6_daddr));

		inet->inet_dport = 0;

		goto out;

	}



	sk->sk_state = TCP_ESTABLISHED;

	sk_set_txhash(sk);

net/ipv6/udp.c

+2 −1
Original line number Diff line number Diff line
@@ -879,7 +879,8 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net, 
	struct sock *sk;



	udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {

		if (INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif))

		if (sk->sk_state == TCP_ESTABLISHED &&

		    INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif))

			return sk;

		/* Only check first socket in chain */

		break;