lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 059/107] netfilter: fix a use-after-free in mtype_destroy()
    Date
    From: Cong Wang <xiyou.wangcong@gmail.com>

    [ Upstream commit c120959387efa51479056fd01dc90adfba7a590c ]

    map->members is freed by ip_set_free() right before using it in
    mtype_ext_cleanup() again. So we just have to move it down.

    Reported-by: syzbot+4c3cc6dbe7259dbf9054@syzkaller.appspotmail.com
    Fixes: 40cd63bf33b2 ("netfilter: ipset: Support extensions which need a per data destroy function")
    Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
    Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h
    index 063df74b46470..e1f271a1b2c14 100644
    --- a/net/netfilter/ipset/ip_set_bitmap_gen.h
    +++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
    @@ -60,9 +60,9 @@ mtype_destroy(struct ip_set *set)
    if (SET_WITH_TIMEOUT(set))
    del_timer_sync(&map->gc);

    - ip_set_free(map->members);
    if (set->dsize && set->extensions & IPSET_EXT_DESTROY)
    mtype_ext_cleanup(set);
    + ip_set_free(map->members);
    ip_set_free(map);

    set->data = NULL;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-24 15:36    [W:4.839 / U:0.780 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site