diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:02:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:02:54 +0800 |
| commit | 0681158391fc57e4c164989b5b7d41565fddf7e2 (patch) | |
| tree | 3e9caae3705c2114d7c487afe60c0d09407c16c9 /net/dccp/ipv6.c | |
| parent | 4874c07664d8a52253ca73c8dd53bf13aeb61acb (diff) | |
| parent | 7166ceea0a4eba3f8c86925ad60e6f0543db6234 (diff) | |
Merge tag 'v3.18.84' into linux-linaro-lsk-v3.18lsk-v3.18-17.11
This is the 3.18.84 stable release
Diffstat (limited to 'net/dccp/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 7 |
1 files changed, 7 insertions, 0 deletions
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) { |