2017-11-07 21:38:42 -05:00
|
|
|
From f52d6739f6a67cf1c918a4557e88b519b9135930 Mon Sep 17 00:00:00 2001
|
2017-10-29 22:14:37 -04:00
|
|
|
From: Eric Dumazet <edumazet@google.com>
|
2017-11-07 21:38:42 -05:00
|
|
|
Date: Tue, 09 May 2017 06:29:19 -0700
|
|
|
|
|
Subject: [PATCH] dccp/tcp: do not inherit mc_list from parent
|
2017-10-29 22:14:37 -04:00
|
|
|
|
|
|
|
|
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 !
|
|
|
|
|
|
2017-11-07 21:38:42 -05:00
|
|
|
Change-Id: I2eac7b825a5b597af14a0573b76b685131c46726
|
2017-10-29 22:14:37 -04:00
|
|
|
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>
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
|
2017-11-07 21:38:42 -05:00
|
|
|
index fb10d58..325edfe 100644
|
2017-10-29 22:14:37 -04:00
|
|
|
--- a/net/ipv4/inet_connection_sock.c
|
|
|
|
|
+++ b/net/ipv4/inet_connection_sock.c
|
2017-11-07 21:38:42 -05:00
|
|
|
@@ -618,6 +618,8 @@
|
|
|
|
|
inet_sk(newsk)->inet_sport = inet_rsk(req)->loc_port;
|
|
|
|
|
newsk->sk_write_space = sk_stream_write_space;
|
2017-10-29 22:14:37 -04:00
|
|
|
|
|
|
|
|
+ inet_sk(newsk)->mc_list = NULL;
|
|
|
|
|
+
|
|
|
|
|
newsk->sk_mark = inet_rsk(req)->ir_mark;
|
2017-11-07 21:38:42 -05:00
|
|
|
|
|
|
|
|
newicsk->icsk_retransmits = 0;
|
