diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2020-01-10 11:53:08 -0800 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-01-15 13:48:52 +0100 |
| commit | d5bfa437b4c0efb49873c5f5e4d2e1d543252112 (patch) | |
| tree | 8001bb2e632e50a06dec700ad0f993c639ed729c /kernel/net/netfilter | |
| parent | b48328cdef146ce2a404df6c1125f54eeec44042 (diff) | |
netfilter: fix a use-after-free in mtype_destroy()
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")
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'kernel/net/netfilter')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h index 5bf6bbd..3f2bd26 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h @@ -61,9 +61,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; |