diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-05-09 06:29:19 -0700 |
|---|---|---|
| committer | Jonathan Solnit <jsolnit@google.com> | 2017-07-19 20:14:54 +0000 |
| commit | 19de51851e15cf62e6771f619b2344cc6051e184 (patch) | |
| tree | eb6eb8d1c05fc9c50db063108c5c8e571d539835 | |
| parent | f75710412ca5597fa70d706125ddf9c87de99817 (diff) | |
| download | x86_64-19de51851e15cf62e6771f619b2344cc6051e184.tar.gz | |
BACKPORT: dccp/tcp: do not inherit mc_list from parent
syzkaller found a way to trigger double frees from ip_mc_drop_socket()
It turns out that leave a copy of parent mc_list at accept() time,
which is very bad.
Very similar to commit 8b485ce69876 ("tcp: do not inherit
fastopen_req from parent")
Initial report from Pray3r, completed by Andrey one.
Thanks a lot to them !
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Pray3r <pray3r.z@gmail.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Roberto Pereira <rpere@google.com>
(cherry picked from commit 657831ffc38e30092a2d5f03d385d710eb88b09a)
Bug:38413975
Change-Id: Icf89ad025cb8225e806e52c573d68533912111ad
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 6dfec2f18214..b7a3d6bd5671 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -690,6 +690,8 @@ struct sock *inet_csk_clone_lock(const struct sock *sk, inet_sk(newsk)->inet_sport = inet_rsk(req)->loc_port; newsk->sk_write_space = sk_stream_write_space; + inet_sk(newsk)->mc_list = NULL; + newsk->sk_mark = inet_rsk(req)->ir_mark; newicsk->icsk_retransmits = 0; |