diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 22:47:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-10 08:04:04 +0300 |
| commit | c047c3b1af6214b447e353527e394fa3f3e86397 (patch) | |
| tree | 09c424f8e03f4fa7e5f6f0089c6302d15dfdd775 | |
| parent | 0e3c82df576aa8d99e5a867f2c8fac43686d10b7 (diff) | |
| download | linux-c047c3b1af6214b447e353527e394fa3f3e86397.tar.xz | |
netfilter: conntrack: remove uninitialized shadow variable
A recent commit introduced an unconditional use of an uninitialized
variable, as reported in this gcc warning:
net/netfilter/nf_conntrack_core.c: In function '__nf_conntrack_confirm':
net/netfilter/nf_conntrack_core.c:632:33: error: 'ctinfo' may be used uninitialized in this function [-Werror=maybe-uninitialized]
bytes = atomic64_read(&counter[CTINFO2DIR(ctinfo)].bytes);
^
net/netfilter/nf_conntrack_core.c:628:26: note: 'ctinfo' was declared here
enum ip_conntrack_info ctinfo;
The problem is that a local variable shadows the function parameter.
This removes the local variable, which looks like what Pablo originally
intended.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 71d8c47fc653 ("netfilter: conntrack: introduce clash resolution on insertion race")
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 0cd29365004f..566c64e3ec50 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -626,7 +626,6 @@ static void nf_ct_acct_merge(struct nf_conn *ct, enum ip_conntrack_info ctinfo, acct = nf_conn_acct_find(loser_ct); if (acct) { struct nf_conn_counter *counter = acct->counter; - enum ip_conntrack_info ctinfo; unsigned int bytes; /* u32 should be fine since we must have seen one packet. */ |