]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
authorPan Bian <bianpan2016@163.com>
Mon, 10 Dec 2018 13:39:37 +0000 (14:39 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 12 Dec 2018 23:55:50 +0000 (00:55 +0100)
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: 45040978c899 ("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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/ipset/ip_set_list_set.c

index 4eef55da0878e299d0bb912fa7ea69d3d4e91441..8da228da53ae98e0befbcede2d3b3c8f394aefc2 100644 (file)
@@ -531,8 +531,8 @@ nla_put_failure:
                ret = -EMSGSIZE;
        } else {
                cb->args[IPSET_CB_ARG0] = i;
+               ipset_nest_end(skb, atd);
        }
-       ipset_nest_end(skb, atd);
 out:
        rcu_read_unlock();
        return ret;