summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorent Fourcot <florent.fourcot@wifirst.fr>2018-06-04 16:51:19 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2018-06-06 14:01:00 +0200
commitcbdebe481a14b42c45aa9f4ceb5ff19b55de2c57 (patch)
treea62a6f19548cbd09b22c5800bf663aafe0945a7f /net
parent30a2e107108c66cbcb7776b58cbcd7db223a1cc9 (diff)
downloadlinux-stable-cbdebe481a14b42c45aa9f4ceb5ff19b55de2c57.tar.gz
linux-stable-cbdebe481a14b42c45aa9f4ceb5ff19b55de2c57.tar.bz2
linux-stable-cbdebe481a14b42c45aa9f4ceb5ff19b55de2c57.zip
netfilter: ipset: forbid family for hash:mac sets
Userspace `ipset` command forbids family option for hash:mac type: ipset create test hash:mac family inet4 ipset v6.30: Unknown argument: `family' However, this check is not done in kernel itself. When someone use external netlink applications (pyroute2 python library for example), one can create hash:mac with invalid family and inconsistant results from userspace (`ipset` command cannot read set content anymore). This patch enforce the logic in kernel, and forbids insertion of hash:mac with a family set. Since IP_SET_PROTO_UNDEF is defined only for hash:mac, this patch has no impact on other hash:* sets Signed-off-by: Florent Fourcot <florent.fourcot@wifirst.fr> Signed-off-by: Victorien Molle <victorien.molle@wifirst.fr> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipset/ip_set_hash_gen.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index bbad940c0137..8a33dac4e805 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -1234,7 +1234,10 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,
pr_debug("Create set %s with family %s\n",
set->name, set->family == NFPROTO_IPV4 ? "inet" : "inet6");
-#ifndef IP_SET_PROTO_UNDEF
+#ifdef IP_SET_PROTO_UNDEF
+ if (set->family != NFPROTO_UNSPEC)
+ return -IPSET_ERR_INVALID_FAMILY;
+#else
if (!(set->family == NFPROTO_IPV4 || set->family == NFPROTO_IPV6))
return -IPSET_ERR_INVALID_FAMILY;
#endif