]>
Commit | Line | Data |
---|---|---|
dde2eb20 GKH |
1 | From foo@baz Wed 06 Nov 2019 04:45:30 PM CET |
2 | From: Eric Dumazet <edumazet@google.com> | |
3 | Date: Mon, 4 Nov 2019 07:57:55 -0800 | |
4 | Subject: dccp: do not leak jiffies on the wire | |
5 | ||
6 | From: Eric Dumazet <edumazet@google.com> | |
7 | ||
8 | [ Upstream commit 3d1e5039f5f87a8731202ceca08764ee7cb010d3 ] | |
9 | ||
10 | For some reason I missed the case of DCCP passive | |
11 | flows in my previous patch. | |
12 | ||
13 | Fixes: a904a0693c18 ("inet: stop leaking jiffies on the wire") | |
14 | Signed-off-by: Eric Dumazet <edumazet@google.com> | |
15 | Reported-by: Thiemo Nagel <tnagel@google.com> | |
16 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | --- | |
19 | net/dccp/ipv4.c | 2 +- | |
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
21 | ||
22 | --- a/net/dccp/ipv4.c | |
23 | +++ b/net/dccp/ipv4.c | |
24 | @@ -417,7 +417,7 @@ struct sock *dccp_v4_request_recv_sock(c | |
25 | RCU_INIT_POINTER(newinet->inet_opt, rcu_dereference(ireq->ireq_opt)); | |
26 | newinet->mc_index = inet_iif(skb); | |
27 | newinet->mc_ttl = ip_hdr(skb)->ttl; | |
28 | - newinet->inet_id = jiffies; | |
29 | + newinet->inet_id = prandom_u32(); | |
30 | ||
31 | if (dst == NULL && (dst = inet_csk_route_child_sock(sk, newsk, req)) == NULL) | |
32 | goto put_and_exit; |