From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 4B438385151A; Wed, 26 Oct 2022 15:09:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B438385151A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666796988; bh=PDgHn/JSQ8MwULah5JWbnZLfL0WyPc0VI+METGytBNg=; h=From:To:Subject:Date:From; b=XOgM/OD3zp047BPtx46KSU0N4r2fMMVZtftvhZdvH2i6ZI3y/ynKYGz6s7YJaCyJH g8WeU5Ik0l7STVh3oArgAb4qJn8Ecr6+ruKOzojx7kQXznRnLVt63HIc6/w0lksOas oeQbvZz/18qLrxZ+bqlkNn9dghXFiS4Yl948TP8o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] Avoid undefined behaviour in ibm128 implementation of llroundl (BZ #29488) X-Act-Checkin: glibc X-Git-Author: Aurelien Jarno X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: b357157361117182c7a68c90fda7ba431b64442c X-Git-Newrev: 9273b2d0e93e7355656cad3be3a1ca76489df483 Message-Id: <20221026150948.4B438385151A@sourceware.org> Date: Wed, 26 Oct 2022 15:09:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9273b2d0e93e7355656cad3be3a1ca76489df483 commit 9273b2d0e93e7355656cad3be3a1ca76489df483 Author: Aurelien Jarno Date: Mon Oct 10 00:39:33 2022 +0200 Avoid undefined behaviour in ibm128 implementation of llroundl (BZ #29488) Detecting an overflow edge case depended on signed overflow of a long long. Replace the additions and the overflow checks by __builtin_add_overflow(). Reviewed-by: Tulio Magno Quites Machado Filho (cherry picked from commit 2b5478569e72ee4820a6e163d306690c9c0eaf5e) Diff: --- NEWS | 2 ++ sysdeps/ieee754/ldbl-128ibm/s_llroundl.c | 21 +++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index a6da588c85..8c60d3dc8d 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,8 @@ The following bugs are resolved with this release: [29485] Linux: Terminate subprocess on late failure in tst-pidfd [29490] alpha: New __brk_call implementation is broken [29463] math/test-float128-y1 fails on x86_64 + [29488] test-ibm128-llround fails on ppc64el when built with gcc-12 and -O2 + or higher [29528] elf: Call __libc_early_init for reused namespaces [29537] libc: [2.34 regression]: Alignment issue on m68k when using [29539] libc: LD_TRACE_LOADED_OBJECTS changed how vDSO library are diff --git a/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c b/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c index d85154e73a..d8c0de1faf 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c @@ -66,38 +66,35 @@ __llroundl (long double x) /* Peg at max/min values, assuming that the above conversions do so. Strictly speaking, we can return anything for values that overflow, but this is more useful. */ - res = hi + lo; - - /* This is just sign(hi) == sign(lo) && sign(res) != sign(hi). */ - if (__glibc_unlikely (((~(hi ^ lo) & (res ^ hi)) < 0))) + if (__glibc_unlikely (__builtin_add_overflow (hi, lo, &res))) goto overflow; xh -= lo; ldbl_canonicalize (&xh, &xl); - hi = res; if (xh > 0.5) { - res += 1; + if (__glibc_unlikely (__builtin_add_overflow (res, 1, &res))) + goto overflow; } else if (xh == 0.5) { if (xl > 0.0 || (xl == 0.0 && res >= 0)) - res += 1; + if (__glibc_unlikely (__builtin_add_overflow (res, 1, &res))) + goto overflow; } else if (-xh > 0.5) { - res -= 1; + if (__glibc_unlikely (__builtin_add_overflow (res, -1, &res))) + goto overflow; } else if (-xh == 0.5) { if (xl < 0.0 || (xl == 0.0 && res <= 0)) - res -= 1; + if (__glibc_unlikely (__builtin_add_overflow (res, -1, &res))) + goto overflow; } - if (__glibc_unlikely (((~(hi ^ (res - hi)) & (res ^ hi)) < 0))) - goto overflow; - return res; } else