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

Commit 539054a8 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

netfilter: xt_connlimit: fix regression caused by zero family value 

Commit v2.6.28-rc1~717^2~109^2~2 was slightly incomplete; not all
instances of par->match->family were changed to par->family.

References: http://bugzilla.netfilter.org/show_bug.cgi?id=610


Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 887e671f

net/netfilter/xt_connlimit.c

+4 −6
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int count_them(struct xt_connlimit_data *data, 
		      const struct nf_conntrack_tuple *tuple,

		      const union nf_inet_addr *addr,

		      const union nf_inet_addr *mask,

		      const struct xt_match *match)

		      u_int8_t family)

{

	const struct nf_conntrack_tuple_hash *found;

	struct xt_connlimit_conn *conn;
@@ -113,8 +113,7 @@ static int count_them(struct xt_connlimit_data *data, 
	bool addit = true;

	int matches = 0;





	if (match->family == NFPROTO_IPV6)

	if (family == NFPROTO_IPV6)

		hash = &data->iphash[connlimit_iphash6(addr, mask)];

	else

		hash = &data->iphash[connlimit_iphash(addr->ip & mask->ip)];
@@ -157,8 +156,7 @@ static int count_them(struct xt_connlimit_data *data, 
			continue;

		}



		if (same_source_net(addr, mask, &conn->tuple.src.u3,

		    match->family))

		if (same_source_net(addr, mask, &conn->tuple.src.u3, family))

			/* same source network -> be counted! */

			++matches;

		nf_ct_put(found_ct);
@@ -207,7 +205,7 @@ connlimit_mt(const struct sk_buff *skb, const struct xt_match_param *par) 


	spin_lock_bh(&info->data->lock);

	connections = count_them(info->data, tuple_ptr, &addr,

	                         &info->mask, par->match);

	                         &info->mask, par->family);

	spin_unlock_bh(&info->data->lock);



	if (connections < 0) {