diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-12-06 16:49:14 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-12-10 15:30:36 +0100 |
| commit | 51a00be6a0994da2ba6b4ace3b7a0d9373b4b25e (patch) | |
| tree | ce51b68b7612c0b58afc3f0cb1fe1bb9fcc1a96d /net | |
| parent | 00301ef4b26d551141c96efeebff40904241f594 (diff) | |
| download | linux-stable-51a00be6a0994da2ba6b4ace3b7a0d9373b4b25e.tar.gz linux-stable-51a00be6a0994da2ba6b4ace3b7a0d9373b4b25e.tar.bz2 linux-stable-51a00be6a0994da2ba6b4ace3b7a0d9373b4b25e.zip | |
udp: fix l4 hash after reconnect
After the blamed commit below, udp_rehash() is supposed to be called
with both local and remote addresses set.
Currently that is already the case for IPv6 sockets, but for IPv4 the
destination address is updated after rehashing.
Address the issue moving the destination address and port initialization
before rehashing.
Fixes: 1b29a730ef8b ("ipv6/udp: Add 4-tuple hash for connected socket")
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/4761e466ab9f7542c68cdc95f248987d127044d2.1733499715.git.pabeni@redhat.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/datagram.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index cc6d0bd7b0a9..4aca1f05edd3 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c @@ -61,15 +61,17 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len err = -EACCES; goto out; } + + /* Update addresses before rehashing */ + inet->inet_daddr = fl4->daddr; + inet->inet_dport = usin->sin_port; if (!inet->inet_saddr) - inet->inet_saddr = fl4->saddr; /* Update source address */ + inet->inet_saddr = fl4->saddr; if (!inet->inet_rcv_saddr) { inet->inet_rcv_saddr = fl4->saddr; if (sk->sk_prot->rehash) sk->sk_prot->rehash(sk); } - inet->inet_daddr = fl4->daddr; - inet->inet_dport = usin->sin_port; reuseport_has_conns_set(sk); sk->sk_state = TCP_ESTABLISHED; sk_set_txhash(sk); |