netdev - Re: [PATCH 3/3] netfilter: xt_CT: remove a compile warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120403103903.GA20689@1984>
Date:	Tue, 3 Apr 2012 12:39:03 +0200
From:	Pablo Neira Ayuso <pablo@...filter.org>
To:	Tetsuo Handa <penguin-kernel@...ove.SAKURA.ne.jp>
Cc:	netdev@...r.kernel.org, David Miller <davem@...emloft.net>
Subject: Re: [PATCH 3/3] netfilter: xt_CT: remove a compile warning

On Tue, Apr 03, 2012 at 07:27:50PM +0900, Tetsuo Handa wrote:
> pablo@...filter.org:
> > From: Pablo Neira Ayuso <pablo@...filter.org>
> > 
> > If CONFIG_NF_CONNTRACK_TIMEOUT=n we have following warning :
> > 
> >   CC [M]  net/netfilter/xt_CT.o
> > net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:
> > net/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used
> > 
> > Reported-by: Eric Dumazet <eric.dumazet@...il.com>
> > Signed-off-by: Pablo Neira Ayuso <pablo@...filter.org>
> > ---
> >  net/netfilter/xt_CT.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
> > index 0c8e438..138b75e 100644
> > --- a/net/netfilter/xt_CT.c
> > +++ b/net/netfilter/xt_CT.c
> > @@ -281,8 +281,10 @@ out:
> >  	info->ct = ct;
> >  	return 0;
> >  
> > +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> >  err4:
> >  	rcu_read_unlock();
> > +#endif
> >  err3:
> >  	nf_conntrack_free(ct);
> >  err2:
> > -- 
> > 1.7.2.5
> 
> Looking at that function:
> 
[...]
> 262                         }
> 263                         timeout_ext = nf_ct_timeout_ext_add(ct, timeout,
> 264                                                             GFP_KERNEL);
>                             We are under rcu_read_lock() here.

David, can you also apply the following patch?

Thanks.

View attachment "0001-netfilter-xt_CT-allocation-has-to-be-GFP_ATOMIC-unde.patch" of type "text/x-diff" (891 bytes)