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

Commit 9b03a5ef authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Patrick McHardy
Browse files

netfilter: ipset: use the stored first cidr value instead of '1' 



Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 9d883232

net/netfilter/ipset/ip_set_hash_ipportnet.c

+6 −4
Original line number Diff line number Diff line
@@ -156,8 +156,9 @@ hash_ipportnet4_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipportnet4_elem data =

		{ .cidr = h->nets[0].cidr || HOST_MASK };

	struct hash_ipportnet4_elem data = {

		.cidr = h->nets[0].cidr ? h->nets[0].cidr : HOST_MASK

	};



	if (data.cidr == 0)

		return -EINVAL;
@@ -434,8 +435,9 @@ hash_ipportnet6_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipportnet6_elem data =

		{ .cidr = h->nets[0].cidr || HOST_MASK };

	struct hash_ipportnet6_elem data = {

		.cidr = h->nets[0].cidr ? h->nets[0].cidr : HOST_MASK

	};



	if (data.cidr == 0)

		return -EINVAL;

net/netfilter/ipset/ip_set_hash_net.c

+6 −2
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_net4_elem data = { .cidr = h->nets[0].cidr || HOST_MASK };

	struct hash_net4_elem data = {

		.cidr = h->nets[0].cidr ? h->nets[0].cidr : HOST_MASK

	};



	if (data.cidr == 0)

		return -EINVAL;
@@ -336,7 +338,9 @@ hash_net6_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_net6_elem data = { .cidr = h->nets[0].cidr || HOST_MASK };

	struct hash_net6_elem data = {

		.cidr = h->nets[0].cidr ? h->nets[0].cidr : HOST_MASK

	};



	if (data.cidr == 0)

		return -EINVAL;

net/netfilter/ipset/ip_set_hash_netport.c

+4 −2
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ hash_netport4_kadt(struct ip_set *set, const struct sk_buff *skb, 
	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_netport4_elem data = {

		.cidr = h->nets[0].cidr || HOST_MASK };

		.cidr = h->nets[0].cidr ? h->nets[0].cidr : HOST_MASK

	};



	if (data.cidr == 0)

		return -EINVAL;
@@ -397,7 +398,8 @@ hash_netport6_kadt(struct ip_set *set, const struct sk_buff *skb, 
	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_netport6_elem data = {

		.cidr = h->nets[0].cidr || HOST_MASK };

		.cidr = h->nets[0].cidr ? h->nets[0].cidr : HOST_MASK

	};



	if (data.cidr == 0)

		return -EINVAL;