2 files changed, 14 insertions, 5 deletions

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 3a86dfd7ae33..ab7f677a97db 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -36,9 +36,18 @@ static u32 inet_ehashfn(const struct net *net, const __be32 laddr,
                               inet_ehash_secret + net_hash_mix(net));
 }
 
-
+/* This function handles inet_sock, but also timewait and request sockets
+ * for IPv4/IPv6.
+ */
 u32 sk_ehashfn(const struct sock *sk)
 {
+#if IS_ENABLED(CONFIG_IPV6)
+        if (sk->sk_family == AF_INET6 &&
+            !ipv6_addr_v4mapped(&sk->sk_v6_daddr))
+                return inet6_ehashfn(sock_net(sk),
+                                     &sk->sk_v6_rcv_saddr, sk->sk_num,
+                                     &sk->sk_v6_daddr, sk->sk_dport);
+#endif
         return inet_ehashfn(sock_net(sk),
                             sk->sk_rcv_saddr, sk->sk_num,
                             sk->sk_daddr, sk->sk_dport);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 80067d5858b4..ca207df4af1c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -189,7 +189,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 
         if (!inet->inet_saddr)
                 inet->inet_saddr = fl4->saddr;
-        inet->inet_rcv_saddr = inet->inet_saddr;
+        sk_rcv_saddr_set(sk, inet->inet_saddr);
 
         if (tp->rx_opt.ts_recent_stamp && inet->inet_daddr != daddr) {
                 /* Reset inherited state */
@@ -204,7 +204,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                 tcp_fetch_timewait_stamp(sk, &rt->dst);
 
         inet->inet_dport = usin->sin_port;
-        inet->inet_daddr = daddr;
+        sk_daddr_set(sk, daddr);
 
         inet_csk(sk)->icsk_ext_hdr_len = 0;
         if (inet_opt)
@@ -1319,8 +1319,8 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
         newtp                 = tcp_sk(newsk);
         newinet               = inet_sk(newsk);
         ireq                  = inet_rsk(req);
-        newinet->inet_daddr   = ireq->ir_rmt_addr;
-        newinet->inet_rcv_saddr = ireq->ir_loc_addr;
+        sk_daddr_set(newsk, ireq->ir_rmt_addr);
+        sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);
         newinet->inet_saddr           = ireq->ir_loc_addr;
         inet_opt              = ireq->opt;
         rcu_assign_pointer(newinet->inet_opt, inet_opt);