From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Wed, 10 Dec 2014 06:31:43 +0000 (+0100)
Subject: Call synchronize_rcu() in set type (un)register functions only when needed
X-Git-Tag: pablo~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17f7f59cd6c5c1f120bf5586b8f4e025fb45a76e;p=ipset

Call synchronize_rcu() in set type (un)register functions only when needed
---

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index 6043a10..436bfd1 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -214,14 +214,13 @@ ip_set_type_register(struct ip_set_type *type)
 		pr_warn("ip_set type %s, family %s with revision min %u already registered!\n",
 			type->name, family_name(type->family),
 			type->revision_min);
-		ret = -EINVAL;
-		goto unlock;
+		ip_set_type_unlock();
+		return -EINVAL;
 	}
 	list_add_rcu(&type->list, &ip_set_type_list);
 	pr_debug("type %s, family %s, revision %u:%u registered.\n",
 		 type->name, family_name(type->family),
 		 type->revision_min, type->revision_max);
-unlock:
 	ip_set_type_unlock();
 	synchronize_rcu();
 	return ret;
@@ -237,12 +236,12 @@ ip_set_type_unregister(struct ip_set_type *type)
 		pr_warn("ip_set type %s, family %s with revision min %u not registered\n",
 			type->name, family_name(type->family),
 			type->revision_min);
-		goto unlock;
+		ip_set_type_unlock();
+		return;
 	}
 	list_del_rcu(&type->list);
 	pr_debug("type %s, family %s with revision min %u unregistered.\n",
 		 type->name, family_name(type->family), type->revision_min);
-unlock:
 	ip_set_type_unlock();
 
 	synchronize_rcu();