netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>, netfilter-devel@vger.kernel.org
Cc: fw@strlen.de
Subject: Re: [PATCH nf] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency
Date: Fri, 11 Feb 2022 18:52:08 -0800	[thread overview]
Message-ID: <84a8a825-f6b6-53a2-607e-e579b3b6d733@gmail.com> (raw)
In-Reply-To: <20220211235609.218507-1-pablo@netfilter.org>


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>



      parent reply	other threads:[~2022-02-12  2:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=84a8a825-f6b6-53a2-607e-e579b3b6d733@gmail.com \
    --to=eric.dumazet@gmail.com \
    --cc=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).