Skip to contentSkip to conversation

netfilter: nf_tables: fix port natting in little endian archs

PATCH In review Pablo Neira Ayuso 2 participants 2 messages Dec 22, 2014 – Dec 23, 2014

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 netfilter: nf_tables: fix port natting in little endian archs

From: leroy christophe <[email protected]>

Make sure this fetches 16-bits port data from the register. Remove casting to make sparse happy, not needed anymore.

Signed-off-by leroy christophe <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>

---
@Christophe: I have also mangled other spots where this problems will show up and remove casting (not required anymore to make sparse happy). Please, test and will submit this to mainstream. I have included you as author, I wanted to speed up the submission process. Thanks.

 net/ipv4/netfilter/nft_redir_ipv4.c |    8 ++++----
 net/ipv6/netfilter/nft_redir_ipv6.c |    8 ++++----
 net/netfilter/nft_nat.c             |    8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
net/ipv4/netfilter/nft_redir_ipv4.c +4 -4
index ff2d23d..6ecfce6 100644
@@ -27,10 +27,10 @@ static void nft_redir_ipv4_eval(const struct nft_expr *expr,
 
 	memset(&mr, 0, sizeof(mr));
 	if (priv->sreg_proto_min) {
-		mr.range[0].min.all = (__force __be16)
-					data[priv->sreg_proto_min].data[0];
-		mr.range[0].max.all = (__force __be16)
-					data[priv->sreg_proto_max].data[0];
+		mr.range[0].min.all =
+			*(__be16 *)&data[priv->sreg_proto_min].data[0];
+		mr.range[0].max.all =
+			*(__be16 *)&data[priv->sreg_proto_max].data[0];
 		mr.range[0].flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
 	}
net/ipv6/netfilter/nft_redir_ipv6.c +4 -4
index 2433a6b..11820b6 100644
@@ -27,10 +27,10 @@ static void nft_redir_ipv6_eval(const struct nft_expr *expr,
 
 	memset(&range, 0, sizeof(range));
 	if (priv->sreg_proto_min) {
-		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.min_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_min].data[0];
+		range.max_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_max].data[0];
 		range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
 	}
net/netfilter/nft_nat.c +4 -4
index afe2b0b..aff54fb1 100644
@@ -65,10 +65,10 @@ static void nft_nat_eval(const struct nft_expr *expr,
 	}
 
 	if (priv->sreg_proto_min) {
-		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.min_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_min].data[0];
+		range.max_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_max].data[0];
 		range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
 	}
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 5 lines · Pablo Neira Ayuso

From: leroy christophe <[email protected]>

Make sure this fetches 16-bits port data from the register. Remove casting to make sparse happy, not needed anymore.

Quoted 7 lines
Signed-off-by leroy christophe <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>

---
@Christophe: I have also mangled other spots where this problems will show up and remove casting (not required anymore to make sparse happy). Please, test and will submit this to mainstream. I have included you as author, I wanted to speed up the submission process. Thanks.

It works OK, both for NAT and REDIRECT. Tested on ipv4, not tested with ipv6.

Christophe

Quoted 53 lines
  net/ipv4/netfilter/nft_redir_ipv4.c |    8 ++++----
  net/ipv6/netfilter/nft_redir_ipv6.c |    8 ++++----
  net/netfilter/nft_nat.c             |    8 ++++----
  3 files changed, 12 insertions(+), 12 deletions(-)
net/ipv4/netfilter/nft_redir_ipv4.c +4 -4
index ff2d23d..6ecfce6 100644
@@ -27,10 +27,10 @@ static void nft_redir_ipv4_eval(const struct nft_expr *expr,
 
  	memset(&mr, 0, sizeof(mr));
  	if (priv->sreg_proto_min) {
-		mr.range[0].min.all = (__force __be16)
-					data[priv->sreg_proto_min].data[0];
-		mr.range[0].max.all = (__force __be16)
-					data[priv->sreg_proto_max].data[0];
+		mr.range[0].min.all =
+			*(__be16 *)&data[priv->sreg_proto_min].data[0];
+		mr.range[0].max.all =
+			*(__be16 *)&data[priv->sreg_proto_max].data[0];
  		mr.range[0].flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
  	}
net/ipv6/netfilter/nft_redir_ipv6.c +4 -4
index 2433a6b..11820b6 100644
@@ -27,10 +27,10 @@ static void nft_redir_ipv6_eval(const struct nft_expr *expr,
 
  	memset(&range, 0, sizeof(range));
  	if (priv->sreg_proto_min) {
-		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.min_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_min].data[0];
+		range.max_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_max].data[0];
  		range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
  	}
net/netfilter/nft_nat.c +0 -1
index afe2b0b..aff54fb1 100644
@@ -65,10 +65,10 @@ static void nft_nat_eval(const struct nft_expr *expr,
  	}
 
  	if (priv->sreg_proto_min) {
-		range.min_proto.all = (__force __be16)

net/netfilter/nft_nat.c static void nft_nat_eval(const struct nft_expr *expr, · line 74

Quoted 10 lines
net/netfilter/nft_nat.c +4 -3
-					data[priv->sreg_proto_min].data[0];
-		range.max_proto.all = (__force __be16)
-					data[priv->sreg_proto_max].data[0];
+		range.min_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_min].data[0];
+		range.max_proto.all =
+			*(__be16 *)&data[priv->sreg_proto_max].data[0];
  		range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
  	}

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html