]> git.karo-electronics.de Git - linux-beck.git/commit
netfilter: conntrack: remove uninitialized shadow variable
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 19:47:23 +0000 (21:47 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 05:04:04 +0000 (01:04 -0400)
commitc047c3b1af6214b447e353527e394fa3f3e86397
tree09c424f8e03f4fa7e5f6f0089c6302d15dfdd775
parent0e3c82df576aa8d99e5a867f2c8fac43686d10b7
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>
net/netfilter/nf_conntrack_core.c