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

Commit fd6b4247 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ipv6/dccp: do not inherit ipv6_mc_list from parent" into LA.BR.1.2.9.1_1

parents 1970d6e8 06cd3980

net/dccp/ipv6.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -483,6 +483,9 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		newsk->sk_backlog_rcv = dccp_v4_do_rcv;

		newsk->sk_backlog_rcv = dccp_v4_do_rcv;

		newnp->pktoptions  = NULL;

		newnp->pktoptions  = NULL;

		newnp->opt	   = 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_oif   = inet6_iif(skb);

		newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;

		newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;
@@ -558,7 +561,9 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
	/* Clone RX bits */

	/* Clone RX bits */

	newnp->rxopt.all = np->rxopt.all;

	newnp->rxopt.all = np->rxopt.all;





	/* Clone pktoptions received with SYN */

	newnp->ipv6_mc_list = NULL;

	newnp->ipv6_ac_list = NULL;

	newnp->ipv6_fl_list = NULL;

	newnp->pktoptions = NULL;

	newnp->pktoptions = NULL;

	if (ireq6->pktopts != NULL) {

	if (ireq6->pktopts != NULL) {

		newnp->pktoptions = skb_clone(ireq6->pktopts, GFP_ATOMIC);

		newnp->pktoptions = skb_clone(ireq6->pktopts, GFP_ATOMIC);

net/ipv6/tcp_ipv6.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1133,6 +1133,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
		newtp->af_specific = &tcp_sock_ipv6_mapped_specific;

		newtp->af_specific = &tcp_sock_ipv6_mapped_specific;

#endif

#endif





		newnp->ipv6_mc_list = NULL;

		newnp->ipv6_ac_list = NULL;

		newnp->ipv6_ac_list = NULL;

		newnp->ipv6_fl_list = NULL;

		newnp->ipv6_fl_list = NULL;

		newnp->pktoptions  = NULL;

		newnp->pktoptions  = NULL;
@@ -1200,6 +1201,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
	   First: no IPv4 options.

	   First: no IPv4 options.

	 */

	 */

	newinet->inet_opt = NULL;

	newinet->inet_opt = NULL;

	newnp->ipv6_mc_list = NULL;

	newnp->ipv6_ac_list = NULL;

	newnp->ipv6_ac_list = NULL;

	newnp->ipv6_fl_list = NULL;

	newnp->ipv6_fl_list = NULL;