lkml.org 
[lkml]   [2018]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 02/53] netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

    commit f998b6b10144cd9809da6af02758615f789e8aa1 upstream.

    Patch "netfilter: ipset: use nfnl_mutex_is_locked" is added the real
    mutex locking check, which revealed the missing locking in ip_set_net_exit().

    Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
    Reported-by: syzbot+36b06f219f2439fe62e1@syzkaller.appspotmail.com
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/netfilter/ipset/ip_set_core.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/net/netfilter/ipset/ip_set_core.c
    +++ b/net/netfilter/ipset/ip_set_core.c
    @@ -2055,6 +2055,7 @@ ip_set_net_exit(struct net *net)

    inst->is_deleted = true; /* flag for ip_set_nfnl_put */

    + nfnl_lock(NFNL_SUBSYS_IPSET);
    for (i = 0; i < inst->ip_set_max; i++) {
    set = ip_set(inst, i);
    if (set) {
    @@ -2062,6 +2063,7 @@ ip_set_net_exit(struct net *net)
    ip_set_destroy_set(set);
    }
    }
    + nfnl_unlock(NFNL_SUBSYS_IPSET);
    kfree(rcu_dereference_protected(inst->ip_set_list, 1));
    }


    \
     
     \ /
      Last update: 2018-04-17 18:49    [W:3.003 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site