diff options
-rw-r--r-- | drivers/crypto/chelsio/chtls/chtls_cm.c | 2 | ||||
-rw-r--r-- | net/dccp/ipv4.c | 2 | ||||
-rw-r--r-- | net/ipv4/datagram.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 | ||||
-rw-r--r-- | net/sctp/socket.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/crypto/chelsio/chtls/chtls_cm.c b/drivers/crypto/chelsio/chtls/chtls_cm.c index 774d991d7cca..aca75237bbcf 100644 --- a/drivers/crypto/chelsio/chtls/chtls_cm.c +++ b/drivers/crypto/chelsio/chtls/chtls_cm.c | |||
@@ -1297,7 +1297,7 @@ static void make_established(struct sock *sk, u32 snd_isn, unsigned int opt) | |||
1297 | tp->write_seq = snd_isn; | 1297 | tp->write_seq = snd_isn; |
1298 | tp->snd_nxt = snd_isn; | 1298 | tp->snd_nxt = snd_isn; |
1299 | tp->snd_una = snd_isn; | 1299 | tp->snd_una = snd_isn; |
1300 | inet_sk(sk)->inet_id = tp->write_seq ^ jiffies; | 1300 | inet_sk(sk)->inet_id = prandom_u32(); |
1301 | assign_rxopt(sk, opt); | 1301 | assign_rxopt(sk, opt); |
1302 | 1302 | ||
1303 | if (tp->rcv_wnd > (RCV_BUFSIZ_M << 10)) | 1303 | if (tp->rcv_wnd > (RCV_BUFSIZ_M << 10)) |
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index d9b4200ed12d..0d8f782c25cc 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -117,7 +117,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
117 | inet->inet_daddr, | 117 | inet->inet_daddr, |
118 | inet->inet_sport, | 118 | inet->inet_sport, |
119 | inet->inet_dport); | 119 | inet->inet_dport); |
120 | inet->inet_id = dp->dccps_iss ^ jiffies; | 120 | inet->inet_id = prandom_u32(); |
121 | 121 | ||
122 | err = dccp_connect(sk); | 122 | err = dccp_connect(sk); |
123 | rt = NULL; | 123 | rt = NULL; |
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index 9a0fe0c2fa02..4a8550c49202 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c | |||
@@ -73,7 +73,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len | |||
73 | reuseport_has_conns(sk, true); | 73 | reuseport_has_conns(sk, true); |
74 | sk->sk_state = TCP_ESTABLISHED; | 74 | sk->sk_state = TCP_ESTABLISHED; |
75 | sk_set_txhash(sk); | 75 | sk_set_txhash(sk); |
76 | inet->inet_id = jiffies; | 76 | inet->inet_id = prandom_u32(); |
77 | 77 | ||
78 | sk_dst_set(sk, &rt->dst); | 78 | sk_dst_set(sk, &rt->dst); |
79 | err = 0; | 79 | err = 0; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index b74192695955..67b2dc7a1727 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -303,7 +303,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
303 | inet->inet_daddr); | 303 | inet->inet_daddr); |
304 | } | 304 | } |
305 | 305 | ||
306 | inet->inet_id = tp->write_seq ^ jiffies; | 306 | inet->inet_id = prandom_u32(); |
307 | 307 | ||
308 | if (tcp_fastopen_defer_connect(sk, &err)) | 308 | if (tcp_fastopen_defer_connect(sk, &err)) |
309 | return err; | 309 | return err; |
@@ -1450,7 +1450,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb, | |||
1450 | inet_csk(newsk)->icsk_ext_hdr_len = 0; | 1450 | inet_csk(newsk)->icsk_ext_hdr_len = 0; |
1451 | if (inet_opt) | 1451 | if (inet_opt) |
1452 | inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; | 1452 | inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; |
1453 | newinet->inet_id = newtp->write_seq ^ jiffies; | 1453 | newinet->inet_id = prandom_u32(); |
1454 | 1454 | ||
1455 | if (!dst) { | 1455 | if (!dst) { |
1456 | dst = inet_csk_route_child_sock(sk, newsk, req); | 1456 | dst = inet_csk_route_child_sock(sk, newsk, req); |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index ca81e06df165..ffd3262b7a41 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -9306,7 +9306,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, | |||
9306 | newinet->inet_rcv_saddr = inet->inet_rcv_saddr; | 9306 | newinet->inet_rcv_saddr = inet->inet_rcv_saddr; |
9307 | newinet->inet_dport = htons(asoc->peer.port); | 9307 | newinet->inet_dport = htons(asoc->peer.port); |
9308 | newinet->pmtudisc = inet->pmtudisc; | 9308 | newinet->pmtudisc = inet->pmtudisc; |
9309 | newinet->inet_id = asoc->next_tsn ^ jiffies; | 9309 | newinet->inet_id = prandom_u32(); |
9310 | 9310 | ||
9311 | newinet->uc_ttl = inet->uc_ttl; | 9311 | newinet->uc_ttl = inet->uc_ttl; |
9312 | newinet->mc_loop = 1; | 9312 | newinet->mc_loop = 1; |