lkml.org 
[lkml]   [2019]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 05/32] ipv4/igmp: fix build error if !CONFIG_IP_MULTICAST
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 903869bd10e6719b9df6718e785be7ec725df59f ]

    ip_sf_list_clear_all() needs to be defined even if !CONFIG_IP_MULTICAST

    Fixes: 3580d04aa674 ("ipv4/igmp: fix another memory leak in igmpv3_del_delrec()")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: kbuild test robot <lkp@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/igmp.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    --- a/net/ipv4/igmp.c
    +++ b/net/ipv4/igmp.c
    @@ -190,6 +190,17 @@ static void ip_ma_put(struct ip_mc_list
    pmc != NULL; \
    pmc = rtnl_dereference(pmc->next_rcu))

    +static void ip_sf_list_clear_all(struct ip_sf_list *psf)
    +{
    + struct ip_sf_list *next;
    +
    + while (psf) {
    + next = psf->sf_next;
    + kfree(psf);
    + psf = next;
    + }
    +}
    +
    #ifdef CONFIG_IP_MULTICAST

    /*
    @@ -635,17 +646,6 @@ static void igmpv3_clear_zeros(struct ip
    }
    }

    -static void ip_sf_list_clear_all(struct ip_sf_list *psf)
    -{
    - struct ip_sf_list *next;
    -
    - while (psf) {
    - next = psf->sf_next;
    - kfree(psf);
    - psf = next;
    - }
    -}
    -
    static void kfree_pmc(struct ip_mc_list *pmc)
    {
    ip_sf_list_clear_all(pmc->sources);

    \
     
     \ /
      Last update: 2019-06-03 11:19    [W:4.234 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site