* [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency
@ 2022-02-11 23:56 Pablo Neira Ayuso
2022-02-12 0:02 ` Florian Westphal
2022-02-12 2:52 ` Eric Dumazet
0 siblings, 2 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2022-02-11 23:56 UTC (permalink / raw)
To: netfilter-devel; +Cc: eric.dumazet, fw
nf_defrag_ipv6_disable() requires CONFIG_IP6_NF_IPTABLES.
Fixes: 75063c9294fb ("netfilter: xt_socket: fix a typo in socket_mt_destroy()")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/xt_socket.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 662e5eb1cc39..7013f55f05d1 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 = {
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency
2022-02-11 23:56 [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency Pablo Neira Ayuso
@ 2022-02-12 0:02 ` Florian Westphal
2022-02-12 2:52 ` Eric Dumazet
1 sibling, 0 replies; 3+ messages in thread
From: Florian Westphal @ 2022-02-12 0:02 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel, eric.dumazet, fw
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> nf_defrag_ipv6_disable() requires CONFIG_IP6_NF_IPTABLES.
Indeed, thanks for the fix.
Acked-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency
2022-02-11 23:56 [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency Pablo Neira Ayuso
2022-02-12 0:02 ` Florian Westphal
@ 2022-02-12 2:52 ` Eric Dumazet
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2022-02-12 2:52 UTC (permalink / raw)
To: Pablo Neira Ayuso, netfilter-devel; +Cc: fw
On 2/11/22 15:56, Pablo Neira Ayuso wrote:
> nf_defrag_ipv6_disable() requires CONFIG_IP6_NF_IPTABLES.
>
> Fixes: 75063c9294fb ("netfilter: xt_socket: fix a typo in socket_mt_destroy()")
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> net/netfilter/xt_socket.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
> index 662e5eb1cc39..7013f55f05d1 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 = {
Thanks for the fix.
Reviewed-by: Eric Dumazet<edumazet@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-12 2:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-11 23:56 [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency Pablo Neira Ayuso
2022-02-12 0:02 ` Florian Westphal
2022-02-12 2:52 ` Eric Dumazet
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).