[for-3.18.y] ipv6/dccp: do not inherit ipv6_mc_list from parent

Message ID 1511272990-14241-1-git-send-email-amit.pundir@linaro.org
State New
Headers show
Series
  • [for-3.18.y] ipv6/dccp: do not inherit ipv6_mc_list from parent
Related show

Commit Message

Amit Pundir Nov. 21, 2017, 2:03 p.m.
From: WANG Cong <xiyou.wangcong@gmail.com>


commit 83eaddab4378db256d00d295bda6ca997cd13a52 upstream.

Like commit 657831ffc38e ("dccp/tcp: do not inherit mc_list from parent")
we should clear ipv6_mc_list etc. for IPv6 sockets too.

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>

Acked-by: Eric Dumazet <edumazet@google.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Connor O'Brien <connoro@google.com>

[AmitP: cherry-picked this backported commit from android-3.18]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

---
 net/dccp/ipv6.c     | 7 +++++++
 net/ipv6/tcp_ipv6.c | 2 ++
 2 files changed, 9 insertions(+)

-- 
2.7.4

Comments

Greg KH Nov. 21, 2017, 2:13 p.m. | #1
On Tue, Nov 21, 2017 at 07:33:10PM +0530, Amit Pundir wrote:
> From: WANG Cong <xiyou.wangcong@gmail.com>

> 

> commit 83eaddab4378db256d00d295bda6ca997cd13a52 upstream.

> 

> Like commit 657831ffc38e ("dccp/tcp: do not inherit mc_list from parent")

> we should clear ipv6_mc_list etc. for IPv6 sockets too.

> 

> Cc: Eric Dumazet <edumazet@google.com>

> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>

> Acked-by: Eric Dumazet <edumazet@google.com>

> Signed-off-by: David S. Miller <davem@davemloft.net>

> Signed-off-by: Connor O'Brien <connoro@google.com>

> [AmitP: cherry-picked this backported commit from android-3.18]

> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>


Thanks for the backport!

greg k-h

Patch

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index ff186dac3e07..4d925dbe4bb7 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -487,6 +487,9 @@  static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
 		newsk->sk_backlog_rcv = dccp_v4_do_rcv;
 		newnp->pktoptions  = NULL;
 		newnp->opt	   = NULL;
+		newnp->ipv6_mc_list = NULL;
+		newnp->ipv6_ac_list = NULL;
+		newnp->ipv6_fl_list = NULL;
 		newnp->mcast_oif   = inet6_iif(skb);
 		newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;
 
@@ -562,6 +565,10 @@  static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
 	/* Clone RX bits */
 	newnp->rxopt.all = np->rxopt.all;
 
+	newnp->ipv6_mc_list = NULL;
+	newnp->ipv6_ac_list = NULL;
+	newnp->ipv6_fl_list = NULL;
+
 	/* Clone pktoptions received with SYN */
 	newnp->pktoptions = NULL;
 	if (ireq->pktopts != NULL) {
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 19fe7b789a72..b8e05f16659c 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1113,6 +1113,7 @@  static struct sock *tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 		newtp->af_specific = &tcp_sock_ipv6_mapped_specific;
 #endif
 
+		newnp->ipv6_mc_list = NULL;
 		newnp->ipv6_ac_list = NULL;
 		newnp->ipv6_fl_list = NULL;
 		newnp->pktoptions  = NULL;
@@ -1184,6 +1185,7 @@  static struct sock *tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 	   First: no IPv4 options.
 	 */
 	newinet->inet_opt = NULL;
+	newnp->ipv6_mc_list = NULL;
 	newnp->ipv6_ac_list = NULL;
 	newnp->ipv6_fl_list = NULL;