From patchwork Wed Jan 2 19:57:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 1020063 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-98974-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="sf7Ok/35"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43VMKB1LcTz9rxp for ; Thu, 3 Jan 2019 06:57:34 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=UK7 WPaWz2ja+pIiezSoOIajFvnuV8LtApJ1d41LZh59fyRQ8XPXcJwfadcyxJQ3iP1I 6yYl4cSlqvjzmikjGIxo+AvYFecJZ/JwjZhuzfoFYxU9Cl0jC5vEzq2shSnXSU2x Zly+d4dG4pL0qenoQlMsYwXvHRNZSSqWLs6wW900= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=gK17DvG6J 3B4tKZhLq4r5v4DzCc=; b=sf7Ok/35E1CKKwa3CSgmV2w4jgZv/9Owxn6dLhsLK vs2lfjtrP/wsq5J7vVuptA+fzZuYScfxeROFGESwDGWxS05DxIbSHW+tuMyfHoX1 8c81TiSC7Qi/VzzJcVhKpHQVkdL+w/kB7HuNIgZ/Hwm8Y1XAZ1sDnkkTrO4HNmEx Bs= Received: (qmail 76637 invoked by alias); 2 Jan 2019 19:57:28 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 76621 invoked by uid 89); 2 Jan 2019 19:57:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT autolearn=ham version=3.3.2 spammy=H*r:4.89, distributed X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Aurelien Jarno Subject: [PATCH v3] Only build libm with -fno-math-errno (bug 24024) Date: Wed, 2 Jan 2019 20:57:05 +0100 Message-Id: <20190102195704.10968-1-aurelien@aurel32.net> MIME-Version: 1.0 Commit 1294b1892e ("Add support for sqrt asm redirects") added the -fno-math-errno flag to build most of the glibc in order to enable GCC to inline math functions. Due to GCC bug #88576, saving and restoring errno around calls to malloc are optimized-out. In turn this causes strerror to set errno to ENOMEM if it get passed an invalid error number and if malloc sets errno to ENOMEM (which might happen even if it succeeds). This is not allowed by POSIX. This patch changes the build flags, building only libm with -fno-math-errno and all the remaining code with -fno-math-errno. This should be safe as libm doesn't contain any code saving and restoring errno around malloc. This patch can probably be reverted once the GCC bug is fixed and available in stable releases. Tested on x86-64, no regression in the testsuite. Changelog: [BZ #24024] * Makeconfig: Build libm with -fno-math-errno but build the remaining code with -fmath-errno. * string/Makefile [$(build-shared)] (tests): Add test-strerror-errno. [$(build-shared)] (LDLIBS-test-strerror-errno): New variable. * string/test-strerror-errno.c: New file. --- Makeconfig | 6 ++-- string/Makefile | 6 ++++ string/test-strerror-errno.c | 58 ++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 string/test-strerror-errno.c diff --git a/Makeconfig b/Makeconfig index 9dc1a6ba8e..07007c9459 100644 --- a/Makeconfig +++ b/Makeconfig @@ -831,8 +831,10 @@ endif # disable any optimization that assume default rounding mode. +math-flags = -frounding-math -# Build libc/libm using -fno-math-errno, but run testsuite with -fmath-errno. -+extra-math-flags = $(if $(filter libnldbl nonlib testsuite,$(in-module)),-fmath-errno,-fno-math-errno) +# Logically only "libnldbl", "nonlib" and "testsuite" should be using +# -fno-math-errno. However due to GCC bug #88576, only "libm" can use +# -fno-math-errno. ++extra-math-flags = $(if $(filter libm,$(in-module)),-fno-math-errno,-fmath-errno) # We might want to compile with some stack-protection flag. ifneq ($(stack-protector),) diff --git a/string/Makefile b/string/Makefile index bf4fb89b63..38b26a0f8e 100644 --- a/string/Makefile +++ b/string/Makefile @@ -64,6 +64,12 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ # This test allocates a lot of memory and can run for a long time. xtests = tst-strcoll-overflow +# This test needs libdl. +ifeq (yes,$(build-shared)) +tests += test-strerror-errno +LDLIBS-test-strerror-errno = $(libdl) +endif + ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-svc-cmp.out endif diff --git a/string/test-strerror-errno.c b/string/test-strerror-errno.c new file mode 100644 index 0000000000..75f6e43492 --- /dev/null +++ b/string/test-strerror-errno.c @@ -0,0 +1,58 @@ +/* BZ #24024 strerror and errno test. + + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include + +/* malloc is allowed to change errno to a value different than 0, even when + there is no actual error. This happens for example when the memory + allocation through sbrk fails. Simulate this by interposing our own + malloc implementation which sets errno to ENOMEM and calls the original + malloc. */ +void +*malloc (size_t size) +{ + static void *(*real_malloc) (size_t size); + + if (!real_malloc) + real_malloc = dlsym(RTLD_NEXT, "malloc"); + + errno = ENOMEM; + + return (*real_malloc) (size); +} + +/* strerror must not change the value of errno. Unfortunately due to GCC bug + * #88576, this happens when -fmath-errno is used. This simple test checks + * that it doesn't happen. */ +static int +do_test (void) +{ + char *msg; + + errno = 0; + msg = strerror (-3); + (void) msg; + + return errno; +} + +#include