DivestOS/Patches/Linux_CVEs/CVE-2017-8890/ANY/0001.patch

42 lines
1.4 KiB
Diff
Raw Normal View History

2017-11-07 17:32:46 -05:00
From 657831ffc38e30092a2d5f03d385d710eb88b09a Mon Sep 17 00:00:00 2001
2017-10-29 22:14:37 -04:00
From: Eric Dumazet <edumazet@google.com>
2017-11-07 17:32:46 -05:00
Date: Tue, 9 May 2017 06:29:19 -0700
Subject: 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 !
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>
---
2017-11-07 17:32:46 -05:00
net/ipv4/inet_connection_sock.c | 2 ++
1 file changed, 2 insertions(+)
2017-10-29 22:14:37 -04:00
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
2017-11-07 17:32:46 -05:00
index 5e313c1..1054d33 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 17:32:46 -05:00
@@ -794,6 +794,8 @@ struct sock *inet_csk_clone_lock(const struct sock *sk,
/* listeners have SOCK_RCU_FREE, not the children */
sock_reset_flag(newsk, SOCK_RCU_FREE);
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 17:32:46 -05:00
atomic64_set(&newsk->sk_cookie,
atomic64_read(&inet_rsk(req)->ir_cookie));
--
cgit v1.1