Commit 7b5bca46 authored by leroy christophe's avatar leroy christophe Committed by Pablo Neira Ayuso

netfilter: nf_tables: fix port natting in little endian archs

Make sure this fetches 16-bits port data from the register.
Remove casting to make sparse happy, not needed anymore.
Signed-off-by: default avatarleroy christophe <christophe.leroy@c-s.fr>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 70314fc6
...@@ -27,10 +27,10 @@ static void nft_redir_ipv4_eval(const struct nft_expr *expr, ...@@ -27,10 +27,10 @@ static void nft_redir_ipv4_eval(const struct nft_expr *expr,
memset(&mr, 0, sizeof(mr)); memset(&mr, 0, sizeof(mr));
if (priv->sreg_proto_min) { if (priv->sreg_proto_min) {
mr.range[0].min.all = (__force __be16) mr.range[0].min.all =
data[priv->sreg_proto_min].data[0]; *(__be16 *)&data[priv->sreg_proto_min].data[0];
mr.range[0].max.all = (__force __be16) mr.range[0].max.all =
data[priv->sreg_proto_max].data[0]; *(__be16 *)&data[priv->sreg_proto_max].data[0];
mr.range[0].flags |= NF_NAT_RANGE_PROTO_SPECIFIED; mr.range[0].flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
} }
......
...@@ -27,10 +27,10 @@ static void nft_redir_ipv6_eval(const struct nft_expr *expr, ...@@ -27,10 +27,10 @@ static void nft_redir_ipv6_eval(const struct nft_expr *expr,
memset(&range, 0, sizeof(range)); memset(&range, 0, sizeof(range));
if (priv->sreg_proto_min) { if (priv->sreg_proto_min) {
range.min_proto.all = (__force __be16) range.min_proto.all =
data[priv->sreg_proto_min].data[0]; *(__be16 *)&data[priv->sreg_proto_min].data[0];
range.max_proto.all = (__force __be16) range.max_proto.all =
data[priv->sreg_proto_max].data[0]; *(__be16 *)&data[priv->sreg_proto_max].data[0];
range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED; range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
} }
......
...@@ -65,10 +65,10 @@ static void nft_nat_eval(const struct nft_expr *expr, ...@@ -65,10 +65,10 @@ static void nft_nat_eval(const struct nft_expr *expr,
} }
if (priv->sreg_proto_min) { if (priv->sreg_proto_min) {
range.min_proto.all = (__force __be16) range.min_proto.all =
data[priv->sreg_proto_min].data[0]; *(__be16 *)&data[priv->sreg_proto_min].data[0];
range.max_proto.all = (__force __be16) range.max_proto.all =
data[priv->sreg_proto_max].data[0]; *(__be16 *)&data[priv->sreg_proto_max].data[0];
range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED; range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment