* [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6
@ 2020-03-15 14:15 Haishuang Yan
2020-03-15 14:15 ` [PATCH 2/4] netfilter: nf_flow_table: reload iph in nf_flow_nat_ip Haishuang Yan
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Haishuang Yan @ 2020-03-15 14:15 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal
Cc: netfilter-devel, coreteam, netdev, linux-kernel, Haishuang Yan
Since nf_flow_snat_port and nf_flow_snat_ipv6 call pskb_may_pull()
which may change skb->data, so we need to reload ipv6h at the right
palce.
Fixes: a908fdec3dda ("netfilter: nf_flow_table: move ipv6 offload hook
code to nf_flow_table")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
net/netfilter/nf_flow_table_ip.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 5272721..2e6ebbe 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -417,11 +417,12 @@ static int nf_flow_nat_ipv6(const struct flow_offload *flow,
if (test_bit(NF_FLOW_SNAT, &flow->flags) &&
(nf_flow_snat_port(flow, skb, thoff, ip6h->nexthdr, dir) < 0 ||
- nf_flow_snat_ipv6(flow, skb, ip6h, thoff, dir) < 0))
+ nf_flow_snat_ipv6(flow, skb, ipv6_hdr(skb), thoff, dir) < 0))
return -1;
+ ip6h = ipv6_hdr(skb);
if (test_bit(NF_FLOW_DNAT, &flow->flags) &&
(nf_flow_dnat_port(flow, skb, thoff, ip6h->nexthdr, dir) < 0 ||
- nf_flow_dnat_ipv6(flow, skb, ip6h, thoff, dir) < 0))
+ nf_flow_dnat_ipv6(flow, skb, ipv6_hdr(skb), thoff, dir) < 0))
return -1;
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] netfilter: nf_flow_table: reload iph in nf_flow_nat_ip
2020-03-15 14:15 [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Haishuang Yan
@ 2020-03-15 14:15 ` Haishuang Yan
2020-03-15 14:15 ` [PATCH 3/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_tuple_ipv6 Haishuang Yan
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Haishuang Yan @ 2020-03-15 14:15 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal
Cc: netfilter-devel, coreteam, netdev, linux-kernel, Haishuang Yan
Since nf_flow_snat_port and nf_flow_snat_ip call pskb_may_pull()
which may change skb->data, so we need to reload iph at the right
place.
Fixes: 7d2086871762 ("netfilter: nf_flow_table: move ipv4 offload hook
code to nf_flow_table")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
net/netfilter/nf_flow_table_ip.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 2e6ebbe..942bda5 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -146,11 +146,12 @@ static int nf_flow_nat_ip(const struct flow_offload *flow, struct sk_buff *skb,
if (test_bit(NF_FLOW_SNAT, &flow->flags) &&
(nf_flow_snat_port(flow, skb, thoff, iph->protocol, dir) < 0 ||
- nf_flow_snat_ip(flow, skb, iph, thoff, dir) < 0))
+ nf_flow_snat_ip(flow, skb, ip_hdr(skb), thoff, dir) < 0))
return -1;
+ iph = ip_hdr(skb);
if (test_bit(NF_FLOW_DNAT, &flow->flags) &&
(nf_flow_dnat_port(flow, skb, thoff, iph->protocol, dir) < 0 ||
- nf_flow_dnat_ip(flow, skb, iph, thoff, dir) < 0))
+ nf_flow_dnat_ip(flow, skb, ip_hdr(skb), thoff, dir) < 0))
return -1;
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_tuple_ipv6
2020-03-15 14:15 [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Haishuang Yan
2020-03-15 14:15 ` [PATCH 2/4] netfilter: nf_flow_table: reload iph in nf_flow_nat_ip Haishuang Yan
@ 2020-03-15 14:15 ` Haishuang Yan
2020-03-15 14:15 ` [PATCH 4/4] netfilter: nf_flow_table: reload iph in nf_flow_tuple_ip Haishuang Yan
2020-03-15 20:44 ` [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Pablo Neira Ayuso
3 siblings, 0 replies; 6+ messages in thread
From: Haishuang Yan @ 2020-03-15 14:15 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal
Cc: netfilter-devel, coreteam, netdev, linux-kernel, Haishuang Yan
Since pskb_may_pull may change skb->data, so we need to reload ipv6h at
the right place.
Fixes: a908fdec3dda ("netfilter: nf_flow_table: move ipv6 offload hook
code to nf_flow_table")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
net/netfilter/nf_flow_table_ip.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 942bda5..954737f 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -452,6 +452,7 @@ static int nf_flow_tuple_ipv6(struct sk_buff *skb, const struct net_device *dev,
if (!pskb_may_pull(skb, thoff + sizeof(*ports)))
return -1;
+ ip6h = ipv6_hdr(skb);
ports = (struct flow_ports *)(skb_network_header(skb) + thoff);
tuple->src_v6 = ip6h->saddr;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] netfilter: nf_flow_table: reload iph in nf_flow_tuple_ip
2020-03-15 14:15 [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Haishuang Yan
2020-03-15 14:15 ` [PATCH 2/4] netfilter: nf_flow_table: reload iph in nf_flow_nat_ip Haishuang Yan
2020-03-15 14:15 ` [PATCH 3/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_tuple_ipv6 Haishuang Yan
@ 2020-03-15 14:15 ` Haishuang Yan
2020-03-15 20:44 ` [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Pablo Neira Ayuso
3 siblings, 0 replies; 6+ messages in thread
From: Haishuang Yan @ 2020-03-15 14:15 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal
Cc: netfilter-devel, coreteam, netdev, linux-kernel, Haishuang Yan
Since pskb_may_pull may change skb->data, so we need to reload iph at
the right place.
Fixes: 7d2086871762 ("netfilter: nf_flow_table: move ipv4 offload hook
code to nf_flow_table")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
net/netfilter/nf_flow_table_ip.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 954737f..610c60a 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -190,6 +190,7 @@ static int nf_flow_tuple_ip(struct sk_buff *skb, const struct net_device *dev,
if (!pskb_may_pull(skb, thoff + sizeof(*ports)))
return -1;
+ iph = ip_hdr(skb);
ports = (struct flow_ports *)(skb_network_header(skb) + thoff);
tuple->src_v4.s_addr = iph->saddr;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6
2020-03-15 14:15 [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Haishuang Yan
` (2 preceding siblings ...)
2020-03-15 14:15 ` [PATCH 4/4] netfilter: nf_flow_table: reload iph in nf_flow_tuple_ip Haishuang Yan
@ 2020-03-15 20:44 ` Pablo Neira Ayuso
2020-03-16 1:12 ` Haishuang Yan
3 siblings, 1 reply; 6+ messages in thread
From: Pablo Neira Ayuso @ 2020-03-15 20:44 UTC (permalink / raw)
To: Haishuang Yan
Cc: Jozsef Kadlecsik, Florian Westphal, netfilter-devel, coreteam,
netdev, linux-kernel
On Sun, Mar 15, 2020 at 10:15:02PM +0800, Haishuang Yan wrote:
> Since nf_flow_snat_port and nf_flow_snat_ipv6 call pskb_may_pull()
> which may change skb->data, so we need to reload ipv6h at the right
> palce.
Could you collapse patch 1/4 and 2/4 ?
Same thing with patches 3/4 and 4/4 ?
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6
2020-03-15 20:44 ` [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Pablo Neira Ayuso
@ 2020-03-16 1:12 ` Haishuang Yan
0 siblings, 0 replies; 6+ messages in thread
From: Haishuang Yan @ 2020-03-16 1:12 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Jozsef Kadlecsik, Florian Westphal, netfilter-devel, coreteam,
netdev, linux-kernel
> On 2020年3月16日, at 上午4:44, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
>
> On Sun, Mar 15, 2020 at 10:15:02PM +0800, Haishuang Yan wrote:
>> Since nf_flow_snat_port and nf_flow_snat_ipv6 call pskb_may_pull()
>> which may change skb->data, so we need to reload ipv6h at the right
>> palce.
>
> Could you collapse patch 1/4 and 2/4 ?
>
> Same thing with patches 3/4 and 4/4 ?
>
> Thanks.
>
Okay, I will collapse the patches. Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-16 1:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-15 14:15 [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Haishuang Yan
2020-03-15 14:15 ` [PATCH 2/4] netfilter: nf_flow_table: reload iph in nf_flow_nat_ip Haishuang Yan
2020-03-15 14:15 ` [PATCH 3/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_tuple_ipv6 Haishuang Yan
2020-03-15 14:15 ` [PATCH 4/4] netfilter: nf_flow_table: reload iph in nf_flow_tuple_ip Haishuang Yan
2020-03-15 20:44 ` [PATCH 1/4] netfilter: nf_flow_table: reload ipv6h in nf_flow_nat_ipv6 Pablo Neira Ayuso
2020-03-16 1:12 ` Haishuang Yan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).