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
| ||
|
Date: Tue, 15 Jan 2013 20:16:14 +0100 From: Cong Ding <dinggnu@...il.com> To: "Waskiewicz Jr, Peter P" <peter.p.waskiewicz.jr@...el.com> Cc: Pablo Neira Ayuso <pablo@...filter.org>, Patrick McHardy <kaber@...sh.net>, "David S. Miller" <davem@...emloft.net>, "netfilter-devel@...r.kernel.org" <netfilter-devel@...r.kernel.org>, "netfilter@...r.kernel.org" <netfilter@...r.kernel.org>, "coreteam@...filter.org" <coreteam@...filter.org>, "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: Re: [PATCH] net: netfilter/xt_CT.c: fix uninitialized variable On Tue, Jan 15, 2013 at 07:06:51PM +0000, Waskiewicz Jr, Peter P wrote: > On Tue, 2013-01-15 at 19:58 +0100, Cong Ding wrote: > > If CONFIG_NF_CONNTRACK_ZONES is not defined, the variable ret might be > > uninitialized when it goes to err1 through line 125 and 263 respectively. > > So I change these goto err1 to return -EINVAL directly. > > > > Signed-off-by: Cong Ding <dinggnu@...il.com> > > --- > > net/netfilter/xt_CT.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c > > index 2a08430..941f600 100644 > > --- a/net/netfilter/xt_CT.c > > +++ b/net/netfilter/xt_CT.c > > @@ -122,7 +122,7 @@ static int xt_ct_tg_check_v0(const struct xt_tgchk_param *par) > > > > #ifndef CONFIG_NF_CONNTRACK_ZONES > > if (info->zone) > > - goto err1; > > + return -EINVAL; > > #endif > > > > ret = nf_ct_l3proto_try_module_get(par->family); > > @@ -260,7 +260,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) > > > > #ifndef CONFIG_NF_CONNTRACK_ZONES > > if (info->zone) > > - goto err1; > > + return -EINVAL; > > #endif > > In dropping both goto's, you left the err1 label unused. Wouldn't just > initializing ret to -EINVAL be easier and cleaner? Then you wouldn't be > messing with the flow of the function. The label err1 are also used in line 130 and 298. I change it to "return -EINVAL" rather than initialize ret to -EINVAL is to keep it the same as line 115 and 253. Otherwise, we should change line 115 and 253 to be goto err1, too? - cong -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists