Re: linux-next: Tree for Aug 2 (netfilter: tproxy)

[MÃtà Eckl]

On Thu, Aug 02, 2018 at 09:05:57PM +0200, Máté Eckl wrote:
> Hi Randy,
> 
> Thanks for reporting!
> 
> Please find the patch attached.

Sorry I made an error in the commit message... See the fix below.

> 
> Regards,
> Mate
> 
> On Thu, Aug 02, 2018 at 09:28:16AM -0700, Randy Dunlap wrote:
> > On 08/02/2018 02:31 AM, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Changes since 20180801:
> > > 
> > 
> > on i386:
> > 
> > ../net/netfilter/nft_tproxy.c: In function 'nft_tproxy_init':
> > ../net/netfilter/nft_tproxy.c:237:3: error: implicit declaration of function 'nf_defrag_ipv6_enable' [-Werror=implicit-function-declaration]
> >    err = nf_defrag_ipv6_enable(ctx->net);
> > 
> > 
> > Full randconfig file is attached.
> > 
> > Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> > 
> > -- 
> > ~Randy

> From 2c3a7d3209ed5e539ecd69192fc0f4186fdc7d99 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?M=C3=A1t=C3=A9=20Eckl?= <ecklm94@xxxxxxxxx>
> Date: Thu, 2 Aug 2018 20:46:13 +0200
> Subject: [PATCH] netfilter: nft_tproxy: Add missing config check
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> A config check was missing form the code when using
> nf_defrag_ipv6_enable with NFT_TPROXY != n and NF_DEFRAG_IPV6 = n and
> this caused the following error in case of :

Please change the last line to:
  this caused the following error:

> 
> ../net/netfilter/nft_tproxy.c: In function 'nft_tproxy_init':
> ../net/netfilter/nft_tproxy.c:237:3: error: implicit declaration of function
> +'nf_defrag_ipv6_enable' [-Werror=implicit-function-declaration]
>    err = nf_defrag_ipv6_enable(ctx->net);
> 
> This patch adds a check for NF_TABLES_IPV6 when NF_DEFRAG_IPV6 is
> selected by Kconfig.
> 
> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Fixes: 4ed8eb6570a4 ("netfilter: nf_tables: Add native tproxy support")
> Signed-off-by: Máté Eckl <ecklm94@xxxxxxxxx>
> ---
>  net/netfilter/nft_tproxy.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/net/netfilter/nft_tproxy.c b/net/netfilter/nft_tproxy.c
> index c6845f7baa08..eff99dffc842 100644
> --- a/net/netfilter/nft_tproxy.c
> +++ b/net/netfilter/nft_tproxy.c
> @@ -234,9 +234,11 @@ static int nft_tproxy_init(const struct nft_ctx *ctx,
>  		err = nf_defrag_ipv4_enable(ctx->net);
>  		if (err)
>  			return err;
> +#if IS_ENABLED(CONFIG_NF_TABLES_IPV6)
>  		err = nf_defrag_ipv6_enable(ctx->net);
>  		if (err)
>  			return err;
> +#endif
>  		break;
>  	default:
>  		return -EOPNOTSUPP;
> -- 
> ecklm
>