From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 27 Nov 2012 16:10:33 +0000 (+0100)
Subject: Make sure ip_set_max isn't set to IPSET_INVALID_ID
X-Git-Tag: v6.17~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c865489e3a897d7c48578c840946cf86cac2e00;p=thirdparty%2Fipset.git

Make sure ip_set_max isn't set to IPSET_INVALID_ID
---

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index bd87ef86..962f1242 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -811,7 +811,7 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb,
 		struct ip_set **list, **tmp;
 		ip_set_id_t i = ip_set_max + IP_SET_INC;
 
-		if (i < ip_set_max)
+		if (i < ip_set_max || i == IPSET_INVALID_ID)
 			/* Wraparound */
 			goto cleanup;