From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409AbcEITsY (ORCPT ); Mon, 9 May 2016 15:48:24 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:60786 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751145AbcEITsX (ORCPT ); Mon, 9 May 2016 15:48:23 -0400 From: Arnd Bergmann To: Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" Cc: Arnd Bergmann , Florian Westphal , Daniel Borkmann , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: conntrack: remove uninitialized shadow variable Date: Mon, 9 May 2016 21:47:23 +0200 Message-Id: <1462823254-3137116-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:TJYRDbe1HQjqfDz+MJXErDrHcZhe/Jz6HVGhSa1RNeawkoYXCE1 FzyExnbfp6vNf8f36vaNJgUdPaBl6iGULS4VdkAhWg9N8IlSwXI2ein9fCQhJ9zCMw6xUFp 3zRvGxvYwNST5jAeFWXVN7R8CYAoLBwS/oqgPWcWPobLlpdV2GQ7RUJixjBqGMh/yTM4j5y RXhnnJarrz4HnsvdIAjeQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:R7Mq0EjP5tA=:5g2hfXQhRj7Wo2LT9BcJS1 dtQbVWmQdoX/hTJK1rRhx6aWI9LcaiyLtZq2DP+GCI1d7YDg/uw/Y5bU0BlgFQsx1aJLjzx8C pVn49aEcThn/WEXPX7uu8pCCyhz31LXN3sxA2GL1azlSoOcYb6NSnLp2C0r91ru3vPhgWW72t uoQxG8+xOJV6e1VMYePuS0qCKUSGq/6SrbA01RfqZSbBPBZMrByREh4sW/Us2QTF6Iu/RAReK pCjGakIdhcG3j0/6e7JXALpfphmDepLJ+2wy8mhtunMJWwKG/a6iOZqVle2XD0+zE129JXmk6 /RR5RZdsKEmqUUgDZeFYiil2irv/BnaQjjAMDbDrogSr/TVRXPvBg8sEN6spIkZ8W0A3AaBIq clXpUyiRTaRUPW6XqqxpMZ/GbDX+AIHJTECY+UIuHOSVIke6uix3nmuv2iYMZTLyGP9wMRV1H W/NAiteVOBmj2M8z78fIkJV1gjvGouNH+eldN3ABovrXuEbQqjEKzUdLBw0OuV8896Gv7CIIB 9NuF+9NpChTQb4HB0HYk/5X9id48unzEX0DTHK6FDHcxLC0uFFDWWejgsy/2Zu1uWIgMDSskg CCaXtO5/C57arT7/nmWEEgEIuY0Jvh6QQjtW/Sq1nSll1k+Lbn3rbZdA2gWNnXRYIMA/UKGEh PJIUZQXYra21OIJF8VE3QFAaNW//k7koxzOm3e0gOf/8BnwG+7rpee5lu91wHLUBAAuQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 71d8c47fc653 ("netfilter: conntrack: introduce clash resolution on insertion race") --- net/netfilter/nf_conntrack_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index f58a70410c69..157ffa667395 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -625,7 +625,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. */ -- 2.7.0