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: Thu, 24 Jan 2019 19:21:04 +0100 From: Florian La Roche <florian.laroche@...glemail.com> To: linux-kernel@...r.kernel.org Cc: Crt Mori <cmo@...exis.com>, Joe Perches <joe@...ches.com>, Davidlohr Bueso <dave@...olabs.net>, Will Deacon <will.deacon@....com>, Peter Zijlstra <peterz@...radead.org>, Linus Torvalds <torvalds@...ux-foundation.org>, Florian La Roche <Florian.LaRoche@...glemail.com> Subject: int_sqrt() adjustments __fls() is returning an unsigned long, but fls() and fls64() are both returning a (signed) int. As we need a signed int as right operand of "<<" (as Linus pointed out), change __fls() to fls() for 32bit and also adjust masking the lowest bit to be a signed int. Now the 32bit and the 64bit version are again similar. best regards, Florian La Roche Signed-off-by: Florian La Roche <Florian.LaRoche@...glemail.com> --- lib/int_sqrt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/int_sqrt.c b/lib/int_sqrt.c index 30e0f9770f88..66eb93105812 100644 --- a/lib/int_sqrt.c +++ b/lib/int_sqrt.c @@ -23,7 +23,7 @@ unsigned long int_sqrt(unsigned long x) if (x <= 1) return x; - m = 1UL << (__fls(x) & ~1UL); + m = 1UL << ((fls(x) - 1) & ~1L); while (m != 0) { b = y + m; y >>= 1; @@ -52,7 +52,7 @@ u32 int_sqrt64(u64 x) if (x <= ULONG_MAX) return int_sqrt((unsigned long) x); - m = 1ULL << ((fls64(x) - 1) & ~1ULL); + m = 1ULL << ((fls64(x) - 1) & ~1LL); while (m != 0) { b = y + m; y >>= 1; -- 2.17.1
Powered by blists - more mailing lists