From: Eric Dumazet <edumazet@google.com>
Date: Wed, 9 Feb 2022 02:30:43 +0000 (-0800)
Subject: netfilter: xt_socket: fix a typo in socket_mt_destroy()
X-Git-Tag: archive/raspbian/5.16.11-1+rpi1^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3761519096e6f8d78266510e5d19b8dbc8356bc8;p=linux.git

netfilter: xt_socket: fix a typo in socket_mt_destroy()

Origin: https://git.kernel.org/linus/75063c9294fb239bbe64eb72141b6871fe526d29

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>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name netfilter-xt_socket-fix-a-typo-in-socket_mt_destroy.patch
---

diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 5e6459e1160..662e5eb1cc3 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 = {