]> git.ipfire.org Git - thirdparty/ipset.git/commit
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
authorPan Bian <bianpan2016@163.com>
Mon, 26 Nov 2018 10:42:10 +0000 (18:42 +0800)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Wed, 28 Nov 2018 17:23:23 +0000 (18:23 +0100)
commit3bd458e42f23b2ff52596432a53fce708c21915b
tree8201085406411c76b6ea2af4ad9b15098282455a
parentbad58fb5a6e318e33a5be150bb6d0c0482b0a2d6
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel

In the error handling block, nla_nest_cancel(skb, atd) is called to
cancel the nest operation. But then, ipset_nest_end(skb, atd) is
unexpected called to end the nest operation. This patch calls the
ipset_nest_end only on the branch that nla_nest_cancel is
not called.

Fixes: 45040978c89("netfilter: ipset: Fix set:list type crash when
flush/dump set in parallel")

Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
kernel/net/netfilter/ipset/ip_set_list_set.c