[PATCH] netfilter: xt_CT: remove a compile warning

[PATCH] netfilter: xt_CT: remove a compile warning

[Eric Dumazet]

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

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/xt_CT.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 0c8e438..6d4ca2f 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -269,7 +269,9 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
 		} else {
 			ret = -ENOENT;
 			pr_info("Timeout policy base is empty\n");
-			goto err4;
+err4:
+			rcu_read_unlock();
+			goto err3;
 		}
 		rcu_read_unlock();
 	}
@@ -281,8 +283,6 @@ out:
 	info->ct = ct;
 	return 0;
 
-err4:
-	rcu_read_unlock();
 err3:
 	nf_conntrack_free(ct);
 err2:

Re: [PATCH] netfilter: xt_CT: remove a compile warning

[Pablo Neira Ayuso]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

On Tue, Apr 03, 2012 at 05:48:22AM +0200, Eric Dumazet wrote:
> 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

Thanks Eric.

I think I prefer the one attached.

I 'll pass it to davem with a couple of other minor fixes anytime soon.

[-- Attachment #2: 0001-netfilter-xt_CT-remove-a-compile-warning.patch --]
[-- Type: text/x-diff, Size: 1055 bytes --]

>From 44b52bccf855b0706de624c29fc3d82ca954bb4e Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 3 Apr 2012 10:08:48 +0200
Subject: [PATCH] netfilter: xt_CT: remove a compile warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.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

Re: [PATCH] netfilter: xt_CT: remove a compile warning

[Eric Dumazet]

On Tue, 2012-04-03 at 10:17 +0200, Pablo Neira Ayuso wrote:
> On Tue, Apr 03, 2012 at 05:48:22AM +0200, Eric Dumazet wrote:
> > 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
> 
> Thanks Eric.
> 
> I think I prefer the one attached.
> 
> I 'll pass it to davem with a couple of other minor fixes anytime soon.

Its your call, but you should move the whole

#if CONFIG_NF_CONNTRACK_TIMEOUT
	... lot of lines ...
#endif

in a helper function to make things a bit more maintainable

Re: [PATCH] netfilter: xt_CT: remove a compile warning

[Pablo Neira Ayuso]

On Tue, Apr 03, 2012 at 10:31:23AM +0200, Eric Dumazet wrote:
> On Tue, 2012-04-03 at 10:17 +0200, Pablo Neira Ayuso wrote:
> > On Tue, Apr 03, 2012 at 05:48:22AM +0200, Eric Dumazet wrote:
> > > 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
> > 
> > Thanks Eric.
> > 
> > I think I prefer the one attached.
> > 
> > I 'll pass it to davem with a couple of other minor fixes anytime soon.
> 
> Its your call, but you should move the whole
> 
> #if CONFIG_NF_CONNTRACK_TIMEOUT
> 	... lot of lines ...
> #endif
> 
> in a helper function to make things a bit more maintainable

I will, thanks for the suggestion.