Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f1799ba authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Consistent userspace testing with nomatch flag 



The "nomatch" commandline flag should invert the matching at testing,
similarly to the --return-nomatch flag of the "set" match of iptables.
Until now it worked with the elements with "nomatch" flag only. From
now on it works with elements without the flag too, i.e:

 # ipset n test hash:net
 # ipset a test 10.0.0.0/24 nomatch
 # ipset t test 10.0.0.1
 10.0.0.1 is NOT in set test.
 # ipset t test 10.0.0.1 nomatch
 10.0.0.1 is in set test.

 # ipset a test 192.168.0.0/24
 # ipset t test 192.168.0.1
 192.168.0.1 is in set test.
 # ipset t test 192.168.0.1 nomatch
 192.168.0.1 is NOT in set test.

 Before the patch the results were

 ...
 # ipset t test 192.168.0.1
 192.168.0.1 is in set test.
 # ipset t test 192.168.0.1 nomatch
 192.168.0.1 is in set test.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 55524c21

include/linux/netfilter/ipset/ip_set.h

+4 −2
Original line number Diff line number Diff line
@@ -296,10 +296,12 @@ ip_set_eexist(int ret, u32 flags) 


/* Match elements marked with nomatch */

static inline bool

ip_set_enomatch(int ret, u32 flags, enum ipset_adt adt)

ip_set_enomatch(int ret, u32 flags, enum ipset_adt adt, struct ip_set *set)

{

	return adt == IPSET_TEST &&

	       ret == -ENOTEMPTY && ((flags >> 16) & IPSET_FLAG_NOMATCH);

	       (set->type->features & IPSET_TYPE_NOMATCH) &&

	       ((flags >> 16) & IPSET_FLAG_NOMATCH) &&

	       (ret > 0 || ret == -ENOTEMPTY);

}



/* Check the NLA_F_NET_BYTEORDER flag */

net/netfilter/ipset/ip_set_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1489,8 +1489,7 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb, 
	if (ret == -EAGAIN)

		ret = 1;



	return (ret < 0 && ret != -ENOTEMPTY) ? ret :

		ret > 0 ? 0 : -IPSET_ERR_EXIST;

	return ret > 0 ? 0 : -IPSET_ERR_EXIST;

}



/* Get headed data of a set */

net/netfilter/ipset/ip_set_hash_ipportnet.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[], 
		e.ip = htonl(ip);

		e.ip2 = htonl(ip2_from & ip_set_hostmask(e.cidr + 1));

		ret = adtfn(set, &e, &ext, &ext, flags);

		return ip_set_enomatch(ret, flags, adt) ? 1 :

		return ip_set_enomatch(ret, flags, adt, set) ? -ret :

		       ip_set_eexist(ret, flags) ? 0 : ret;

	}
@@ -544,7 +544,7 @@ hash_ipportnet6_uadt(struct ip_set *set, struct nlattr *tb[], 


	if (adt == IPSET_TEST || !with_ports || !tb[IPSET_ATTR_PORT_TO]) {

		ret = adtfn(set, &e, &ext, &ext, flags);

		return ip_set_enomatch(ret, flags, adt) ? 1 :

		return ip_set_enomatch(ret, flags, adt, set) ? -ret :

		       ip_set_eexist(ret, flags) ? 0 : ret;

	}

net/netfilter/ipset/ip_set_hash_net.c

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (adt == IPSET_TEST || !tb[IPSET_ATTR_IP_TO]) {

		e.ip = htonl(ip & ip_set_hostmask(e.cidr));

		ret = adtfn(set, &e, &ext, &ext, flags);

		return ip_set_enomatch(ret, flags, adt) ? 1 :

		return ip_set_enomatch(ret, flags, adt, set) ? -ret:

		       ip_set_eexist(ret, flags) ? 0 : ret;

	}
@@ -396,7 +396,7 @@ hash_net6_uadt(struct ip_set *set, struct nlattr *tb[], 


	ret = adtfn(set, &e, &ext, &ext, flags);



	return ip_set_enomatch(ret, flags, adt) ? 1 :

	return ip_set_enomatch(ret, flags, adt, set) ? -ret :

	       ip_set_eexist(ret, flags) ? 0 : ret;

}

net/netfilter/ipset/ip_set_hash_netiface.c

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (adt == IPSET_TEST || !tb[IPSET_ATTR_IP_TO]) {

		e.ip = htonl(ip & ip_set_hostmask(e.cidr));

		ret = adtfn(set, &e, &ext, &ext, flags);

		return ip_set_enomatch(ret, flags, adt) ? 1 :

		return ip_set_enomatch(ret, flags, adt, set) ? -ret :

		       ip_set_eexist(ret, flags) ? 0 : ret;

	}
@@ -634,7 +634,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[], 


	ret = adtfn(set, &e, &ext, &ext, flags);



	return ip_set_enomatch(ret, flags, adt) ? 1 :

	return ip_set_enomatch(ret, flags, adt, set) ? -ret :

	       ip_set_eexist(ret, flags) ? 0 : ret;

}