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

Commit a467704d authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

[NETFILTER]: GRE conntrack: fix htons/htonl confusion 



GRE keys are 16 bit.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c170a09

net/ipv4/netfilter/ip_nat_proto_gre.c

+6 −6
Original line number Diff line number Diff line
@@ -49,15 +49,15 @@ gre_in_range(const struct ip_conntrack_tuple *tuple, 
	     const union ip_conntrack_manip_proto *min,

	     const union ip_conntrack_manip_proto *max)

{

	u_int32_t key;

	__be16 key;



	if (maniptype == IP_NAT_MANIP_SRC)

		key = tuple->src.u.gre.key;

	else

		key = tuple->dst.u.gre.key;



	return ntohl(key) >= ntohl(min->gre.key)

		&& ntohl(key) <= ntohl(max->gre.key);

	return ntohs(key) >= ntohs(min->gre.key)

		&& ntohs(key) <= ntohs(max->gre.key);

}



/* generate unique tuple ... */
@@ -81,14 +81,14 @@ gre_unique_tuple(struct ip_conntrack_tuple *tuple, 
		min = 1;

		range_size = 0xffff;

	} else {

		min = ntohl(range->min.gre.key);

		range_size = ntohl(range->max.gre.key) - min + 1;

		min = ntohs(range->min.gre.key);

		range_size = ntohs(range->max.gre.key) - min + 1;

	}



	DEBUGP("min = %u, range_size = %u\n", min, range_size); 



	for (i = 0; i < range_size; i++, key++) {

		*keyptr = htonl(min + key % range_size);

		*keyptr = htons(min + key % range_size);

		if (!ip_nat_used_tuple(tuple, conntrack))

			return 1;

	}