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

Commit 74bb421d authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Use correct byteorder in ICMP NAT 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21f930e4

net/ipv4/netfilter/ip_nat_proto_icmp.c

+4 −3
Original line number Diff line number Diff line
@@ -35,16 +35,17 @@ icmp_unique_tuple(struct ip_conntrack_tuple *tuple, 
		  const struct ip_conntrack *conntrack)

{

	static u_int16_t id;

	unsigned int range_size

		= (unsigned int)range->max.icmp.id - range->min.icmp.id + 1;

	unsigned int range_size;

	unsigned int i;



	range_size = ntohs(range->max.icmp.id) - ntohs(range->min.icmp.id) + 1;

	/* If no range specified... */

	if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED))

		range_size = 0xFFFF;



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

		tuple->src.u.icmp.id = range->min.icmp.id + (id % range_size);

		tuple->src.u.icmp.id = htons(ntohs(range->min.icmp.id) +

		                             (id % range_size));

		if (!ip_nat_used_tuple(tuple, conntrack))

			return 1;

	}