lkml.org 
[lkml]   [2017]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 003/115] ipv6/dccp: do not inherit ipv6_mc_list from parent
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: WANG Cong <xiyou.wangcong@gmail.com>


    [ Upstream commit 83eaddab4378db256d00d295bda6ca997cd13a52 ]

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/dccp/ipv6.c | 6 ++++++
    net/ipv6/tcp_ipv6.c | 2 ++
    2 files changed, 8 insertions(+)

    --- a/net/dccp/ipv6.c
    +++ b/net/dccp/ipv6.c
    @@ -426,6 +426,9 @@ static struct sock *dccp_v6_request_recv
    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;

    @@ -490,6 +493,9 @@ static struct sock *dccp_v6_request_recv
    /* Clone RX bits */
    newnp->rxopt.all = np->rxopt.all;

    + newnp->ipv6_mc_list = NULL;
    + newnp->ipv6_ac_list = NULL;
    + newnp->ipv6_fl_list = NULL;
    newnp->pktoptions = NULL;
    newnp->opt = NULL;
    newnp->mcast_oif = inet6_iif(skb);
    --- a/net/ipv6/tcp_ipv6.c
    +++ b/net/ipv6/tcp_ipv6.c
    @@ -1070,6 +1070,7 @@ static struct sock *tcp_v6_syn_recv_sock
    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;
    @@ -1139,6 +1140,7 @@ static struct sock *tcp_v6_syn_recv_sock
    First: no IPv4 options.
    */
    newinet->inet_opt = NULL;
    + newnp->ipv6_mc_list = NULL;
    newnp->ipv6_ac_list = NULL;
    newnp->ipv6_fl_list = NULL;


    \
     
     \ /
      Last update: 2017-06-12 00:27    [W:4.078 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site