summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQingfang DENG <dqfext@gmail.com>2022-12-08 20:35:29 +0800
committerPablo Neira Ayuso <pablo@netfilter.org>2022-12-08 21:43:25 +0100
commit5fb45f95eec682621748b7cb012c6a8f0f981e6a (patch)
tree3ead6986b2833ce2ea2ac392981d173b8aea6a35
parentf8bac7f9fdb0017b32157957ffffd490f95faa07 (diff)
downloadlinux-stable-5fb45f95eec682621748b7cb012c6a8f0f981e6a.tar.gz
linux-stable-5fb45f95eec682621748b7cb012c6a8f0f981e6a.tar.bz2
linux-stable-5fb45f95eec682621748b7cb012c6a8f0f981e6a.zip
netfilter: flowtable: really fix NAT IPv6 offload
The for-loop was broken from the start. It translates to: for (i = 0; i < 4; i += 4) which means the loop statement is run only once, so only the highest 32-bit of the IPv6 address gets mangled. Fix the loop increment. Fixes: 0e07e25b481a ("netfilter: flowtable: fix NAT IPv6 offload mangling") Fixes: 5c27d8d76ce8 ("netfilter: nf_flow_table_offload: add IPv6 support") Signed-off-by: Qingfang DENG <dqfext@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/nf_flow_table_offload.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index 0fdcdb2c9ae4..4d9b99abe37d 100644
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -383,12 +383,12 @@ static void flow_offload_ipv6_mangle(struct nf_flow_rule *flow_rule,
const __be32 *addr, const __be32 *mask)
{
struct flow_action_entry *entry;
- int i, j;
+ int i;
- for (i = 0, j = 0; i < sizeof(struct in6_addr) / sizeof(u32); i += sizeof(u32), j++) {
+ for (i = 0; i < sizeof(struct in6_addr) / sizeof(u32); i++) {
entry = flow_action_entry_next(flow_rule);
flow_offload_mangle(entry, FLOW_ACT_MANGLE_HDR_TYPE_IP6,
- offset + i, &addr[j], mask);
+ offset + i * sizeof(u32), &addr[i], mask);
}
}