Make sure the proper is_destroyed value is checked at dumping

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index e20bfa5a87a460ae32a18e3430b8a1f09788bd19..5319896b0d8a93690408d3372773ae1a512ece5c 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -1257,6 +1257,7 @@ ip_set_dump_start(struct sk_buff *skb, struct netlink_callback *cb)
        unsigned int flags = NETLINK_PORTID(cb->skb) ? NLM_F_MULTI : 0;
        struct ip_set_net *inst = ip_set_pernet(sock_net(skb->sk));
        u32 dump_type, dump_flags;
+       bool is_destroyed;
        int ret = 0;
 
        if (!cb->args[IPSET_CB_DUMP]) {
@@ -1286,13 +1287,14 @@ dump_last:
                index = (ip_set_id_t)cb->args[IPSET_CB_INDEX];
                write_lock_bh(&ip_set_ref_lock);
                set = ip_set(inst, index);
-               if (set == NULL || inst->is_destroyed) {
+               is_destroyed = inst->is_destroyed;
+               if (set == NULL || is_destroyed) {
                        write_unlock_bh(&ip_set_ref_lock);
                        if (dump_type == DUMP_ONE) {
                                ret = -ENOENT;
                                goto out;
                        }
-                       if (inst->is_destroyed) {
+                       if (is_destroyed) {
                                /* All sets are just being destroyed */
                                ret = 0;
                                goto out;