Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f45934e authored by WANG Cong's avatar WANG Cong Committed by Greg Kroah-Hartman
Browse files

ipv6/dccp: do not inherit ipv6_mc_list from parent 



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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
[AmitP: cherry-picked this backported commit from android-3.18]
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c35c375e

net/dccp/ipv6.c

+7 −0
Original line number Diff line number Diff line
@@ -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) {

net/ipv6/tcp_ipv6.c

+2 −0
Original line number Diff line number Diff line
@@ -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;