* [PATCH net] netfilter: xt_socket: fix a typo in socket_mt_destroy()
@ 2022-02-09 2:30 Eric Dumazet
2022-02-09 9:29 ` Florian Westphal
0 siblings, 1 reply; 3+ messages in thread
From: Eric Dumazet @ 2022-02-09 2:30 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal
Cc: netfilter-devel, netdev, Eric Dumazet, Eric Dumazet
From: Eric Dumazet <edumazet@google.com>
Calling nf_defrag_ipv4_disable() instead of nf_defrag_ipv6_disable()
was probably not the intent.
I found this by code inspection, while chasing a possible issue in TPROXY.
Fixes: de8c12110a13 ("netfilter: disable defrag once its no longer needed")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Florian Westphal <fw@strlen.de>
---
net/netfilter/xt_socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 5e6459e1160553c0a563a38b5060815e88998b4d..662e5eb1cc39e544191b3aab388c3762674d9251 100644
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -221,7 +221,7 @@ static void socket_mt_destroy(const struct xt_mtdtor_param *par)
if (par->family == NFPROTO_IPV4)
nf_defrag_ipv4_disable(par->net);
else if (par->family == NFPROTO_IPV6)
- nf_defrag_ipv4_disable(par->net);
+ nf_defrag_ipv6_disable(par->net);
}
static struct xt_match socket_mt_reg[] __read_mostly = {
--
2.35.0.263.gb82422642f-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] netfilter: xt_socket: fix a typo in socket_mt_destroy()
2022-02-09 2:30 [PATCH net] netfilter: xt_socket: fix a typo in socket_mt_destroy() Eric Dumazet
@ 2022-02-09 9:29 ` Florian Westphal
2022-02-09 10:08 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Florian Westphal @ 2022-02-09 9:29 UTC (permalink / raw)
To: Eric Dumazet
Cc: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
netfilter-devel, netdev, Eric Dumazet
Eric Dumazet <eric.dumazet@gmail.com> wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> Calling nf_defrag_ipv4_disable() instead of nf_defrag_ipv6_disable()
> was probably not the intent.
Indeed, thanks for catching this.
Reviewed-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] netfilter: xt_socket: fix a typo in socket_mt_destroy()
2022-02-09 9:29 ` Florian Westphal
@ 2022-02-09 10:08 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2022-02-09 10:08 UTC (permalink / raw)
To: Florian Westphal
Cc: Eric Dumazet, Jozsef Kadlecsik, netfilter-devel, netdev,
Eric Dumazet
On Wed, Feb 09, 2022 at 10:29:07AM +0100, Florian Westphal wrote:
> Eric Dumazet <eric.dumazet@gmail.com> wrote:
> > From: Eric Dumazet <edumazet@google.com>
> >
> > Calling nf_defrag_ipv4_disable() instead of nf_defrag_ipv6_disable()
> > was probably not the intent.
>
> Indeed, thanks for catching this.
>
> Reviewed-by: Florian Westphal <fw@strlen.de>
Applied, thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-09 11:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-09 2:30 [PATCH net] netfilter: xt_socket: fix a typo in socket_mt_destroy() Eric Dumazet
2022-02-09 9:29 ` Florian Westphal
2022-02-09 10:08 ` Pablo Neira Ayuso
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).