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

Commit 98c37b6b authored by Tomasz Bursztyka's avatar Tomasz Bursztyka Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_nat: Fix endianness issue reported by sparse 



This patch fixes this:

CHECK   net/netfilter/nft_nat.c
net/netfilter/nft_nat.c:50:43: warning: incorrect type in assignment (different base types)
net/netfilter/nft_nat.c:50:43:    expected restricted __be32 [addressable] [usertype] ip
net/netfilter/nft_nat.c:50:43:    got unsigned int [unsigned] [usertype] <noident>
net/netfilter/nft_nat.c:51:43: warning: incorrect type in assignment (different base types)
net/netfilter/nft_nat.c:51:43:    expected restricted __be32 [addressable] [usertype] ip
net/netfilter/nft_nat.c:51:43:    got unsigned int [unsigned] [usertype] <noident>
net/netfilter/nft_nat.c:65:37: warning: incorrect type in assignment (different base types)
net/netfilter/nft_nat.c:65:37:    expected restricted __be16 [addressable] [assigned] [usertype] all
net/netfilter/nft_nat.c:65:37:    got unsigned int [unsigned] <noident>
net/netfilter/nft_nat.c:66:37: warning: incorrect type in assignment (different base types)
net/netfilter/nft_nat.c:66:37:    expected restricted __be16 [addressable] [assigned] [usertype] all
net/netfilter/nft_nat.c:66:37:    got unsigned int [unsigned] <noident>

Signed-off-by: default avatarTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 6e078bc2

net/netfilter/nft_nat.c

+8 −4
Original line number Diff line number Diff line
@@ -47,8 +47,10 @@ static void nft_nat_eval(const struct nft_expr *expr, 
	memset(&range, 0, sizeof(range));

	if (priv->sreg_addr_min) {

		if (priv->family == AF_INET) {

			range.min_addr.ip = data[priv->sreg_addr_min].data[0];

			range.max_addr.ip = data[priv->sreg_addr_max].data[0];

			range.min_addr.ip = (__force __be32)

					data[priv->sreg_addr_min].data[0];

			range.max_addr.ip = (__force __be32)

					data[priv->sreg_addr_max].data[0];



		} else {

			memcpy(range.min_addr.ip6,
@@ -62,8 +64,10 @@ static void nft_nat_eval(const struct nft_expr *expr, 
	}



	if (priv->sreg_proto_min) {

		range.min_proto.all = data[priv->sreg_proto_min].data[0];

		range.max_proto.all = data[priv->sreg_proto_max].data[0];

		range.min_proto.all = (__force __be16)

					data[priv->sreg_proto_min].data[0];

		range.max_proto.all = (__force __be16)

					data[priv->sreg_proto_max].data[0];

		range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;

	}