linux-kernel - Re: [PATCH] netfilter: xt_hashlimit: Fix integer divide round to zero.

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1486391287.2374.1.camel@gmail.com>
Date:   Mon, 06 Feb 2017 15:28:07 +0100
From:   Alban Browaeys <alban.browaeys@...il.com>
To:     Pablo Neira Ayuso <pablo@...filter.org>
Cc:     Patrick McHardy <kaber@...sh.net>,
        Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>,
        "David S. Miller" <davem@...emloft.net>,
        netfilter-devel@...r.kernel.org, coreteam@...filter.org,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] netfilter: xt_hashlimit: Fix integer divide round to
 zero.

Le lundi 06 février 2017 à 14:04 +0100, Pablo Neira Ayuso a écrit :
> On Sat, Feb 04, 2017 at 11:47:31PM +0100, Alban Browaeys wrote:
> > diff --git a/net/netfilter/xt_hashlimit.c
> > b/net/netfilter/xt_hashlimit.c
> > index 10063408141d..df75ad643eef 100644
> > --- a/net/netfilter/xt_hashlimit.c
> > +++ b/net/netfilter/xt_hashlimit.c
> > @@ -463,21 +463,19 @@ static u32 xt_hashlimit_len_to_chunks(u32 len)
> >  /* Precision saver. */
> >  static u64 user2credits(u64 user, int revision)
> >  {
> > > > +	/* Avoid overflow: divide the constant operands first */
> > > >  	if (revision == 1) {
> > > > -		/* If multiplying would overflow... */
> > > > -		if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY_v1))
> > > > -			/* Divide first. */
> > > > -			return div64_u64(user, XT_HASHLIMIT_SCALE)
> > > > -				* HZ * CREDITS_PER_JIFFY_v1;
> > > > +		return div64_u64(user, div64_u64(XT_HASHLIMIT_SCALE,
> > > > +			HZ * CREDITS_PER_JIFFY_v1));
> >  
> > > > -		return div64_u64(user * HZ * CREDITS_PER_JIFFY_v1,
> > > > +		return user * div64_u64(HZ * CREDITS_PER_JIFFY_v1,
> >  				 XT_HASHLIMIT_SCALE);
> 
> I see two return statements here, the one coming later is
> shadowed, this can't be right.

I fixed revision 2 case then copy the code to revision 1
 and lost the condition in the process.
The code duplication is useless. I will rework it in v2.

Thank you for the review.