From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 11 Feb 2022 23:44:11 +0000 (+0100)
Subject: netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency
X-Git-Tag: archive/raspbian/5.16.11-1+rpi1^2~27
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=15857472f437309dad235e36da8e74c50cfbc63c;p=linux.git

netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency

Origin: https://git.kernel.org/linus/2874b7911132f6975e668f6849c8ac93bc4e1f35

nf_defrag_ipv6_disable() requires CONFIG_IP6_NF_IPTABLES.

Fixes: 75063c9294fb ("netfilter: xt_socket: fix a typo in socket_mt_destroy()")
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Eric Dumazet<edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name netfilter-xt_socket-missing-ifdef-CONFIG_IP6_NF_IPTA.patch
---

diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 662e5eb1cc3..7013f55f05d 100644
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -220,8 +220,10 @@ static void socket_mt_destroy(const struct xt_mtdtor_param *par)
 {
 	if (par->family == NFPROTO_IPV4)
 		nf_defrag_ipv4_disable(par->net);
+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
 	else if (par->family == NFPROTO_IPV6)
 		nf_defrag_ipv6_disable(par->net);
+#endif
 }
 
 static struct xt_match socket_mt_reg[] __read_mostly = {