drop a pending patch that already made it into a stable release

diff --git a/pending/netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch b/pending/netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch
deleted file mode 100644 (file)
index a1986d7..0000000
--- a/pending/netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f998b6b10144cd9809da6af02758615f789e8aa1 Mon Sep 17 00:00:00 2001
-From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-Date: Sat, 6 Jan 2018 15:24:18 +0100
-Subject: netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()
-
-From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-
-commit f998b6b10144cd9809da6af02758615f789e8aa1 upstream.
-
-Patch "netfilter: ipset: use nfnl_mutex_is_locked" is added the real
-mutex locking check, which revealed the missing locking in ip_set_net_exit().
-
-Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-Reported-by: syzbot+36b06f219f2439fe62e1@syzkaller.appspotmail.com
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
-index e00299051e79..728bf31bb386 100644
---- a/net/netfilter/ipset/ip_set_core.c
-+++ b/net/netfilter/ipset/ip_set_core.c
-@@ -2078,6 +2078,7 @@ ip_set_net_exit(struct net *net)
- 
-       inst->is_deleted = true; /* flag for ip_set_nfnl_put */
- 
-+      nfnl_lock(NFNL_SUBSYS_IPSET);
-       for (i = 0; i < inst->ip_set_max; i++) {
-               set = ip_set(inst, i);
-               if (set) {
-@@ -2085,6 +2086,7 @@ ip_set_net_exit(struct net *net)
-                       ip_set_destroy_set(set);
-               }
-       }
-+      nfnl_unlock(NFNL_SUBSYS_IPSET);
-       kfree(rcu_dereference_protected(inst->ip_set_list, 1));
- }
-