From patchwork Mon Aug 1 10:45:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1662502 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=TzHAtp6O; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LxFDG45tvz9sCD for ; Mon, 1 Aug 2022 20:46:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 25E9B3857B8B for ; Mon, 1 Aug 2022 10:46:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25E9B3857B8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1659350796; bh=7sMQLp533/yfuUNIEMXqE8u9ykhX9pTYQQnxu6AJy24=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=TzHAtp6OfZqVsQreGSJLEm/pgmRJ69KZ2huJTRjQU0pzvzjfnsh7E4lvKb9GAyz9F JrnWP9zGs07J/U04smbGeYXhIWF9ntyzeX4xovv7pTArTSWcNjdwvABW68dES83ka/ KZJZ0yrsi4/KDSk53Hc8Ip3lh1JjMrGG+h8syv6A= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 9B9EF385828E for ; Mon, 1 Aug 2022 10:45:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9B9EF385828E Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-fk2GrFagPqeMJcbC212Plg-1; Mon, 01 Aug 2022 06:45:53 -0400 X-MC-Unique: fk2GrFagPqeMJcbC212Plg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 004C5101A54E for ; Mon, 1 Aug 2022 10:45:53 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26E97492C3B for ; Mon, 1 Aug 2022 10:45:51 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 3/3] assert: Do not use stderr in libc-internal assert In-Reply-To: References: X-From-Line: 32183839aed39d547a7ebbd50bbcd5575746a233 Mon Sep 17 00:00:00 2001 Message-Id: <32183839aed39d547a7ebbd50bbcd5575746a233.1659350650.git.fweimer@redhat.com> Date: Mon, 01 Aug 2022 12:45:50 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Redirect internal assertion failures to __libc_assert_fail, based on based on __libc_message, which writes directly to STDERR_FILENO and calls abort. Also disable message translation and reword the error message slightly (adjusting stdlib/tst-bz20544 accordingly). As a result of these changes, malloc no longer needs its own redefinition of __assert_fail. __libc_assert_fail needs to be stubbed out during rtld dependency analysis because the rtld rebuilds turn __libc_assert_fail into __assert_fail, which is unconditionally provided by elf/dl-minimal.c. This change is not possible for the public assert macro and its __assert_fail function because POSIX requires that the diagnostic is written to stderr. Reviewed-by: Adhemerval Zanella --- assert/Makefile | 7 ++++++- assert/__libc_assert_fail.c | 33 +++++++++++++++++++++++++++++++++ assert/assert.c | 1 - elf/Makefile | 1 + include/assert.h | 12 +++++++++--- malloc/malloc.c | 16 ---------------- stdlib/tst-bz20544.c | 2 +- 7 files changed, 50 insertions(+), 22 deletions(-) create mode 100644 assert/__libc_assert_fail.c diff --git a/assert/Makefile b/assert/Makefile index f7cf8e9b77..c905845a43 100644 --- a/assert/Makefile +++ b/assert/Makefile @@ -24,7 +24,12 @@ include ../Makeconfig headers := assert.h -routines := assert assert-perr __assert +routines := \ + __assert \ + __libc_assert_fail \ + assert \ + assert-perr \ + # routines tests := test-assert test-assert-perr tst-assert-c++ tst-assert-g++ ifeq ($(have-cxx-thread_local),yes) diff --git a/assert/__libc_assert_fail.c b/assert/__libc_assert_fail.c new file mode 100644 index 0000000000..149d5feae1 --- /dev/null +++ b/assert/__libc_assert_fail.c @@ -0,0 +1,33 @@ +/* libc-internal assert that calls __libc_message. + Copyright (C) 2022 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 <_itoa.h> +#include +#include +#include + +void +__libc_assert_fail (const char *assertion, const char *file, unsigned int line, + const char *function) +{ + char linebuf[INT_BUFSIZE_BOUND (unsigned int)]; + array_end (linebuf)[-1] = '\0'; + char *linestr = _itoa_word (line, array_end (linebuf) - 1, 10, 0); + __libc_message ("Fatal glibc error: %s:%s (%s): assertion failed: %s\n", + file, linestr, function, assertion); +} diff --git a/assert/assert.c b/assert/assert.c index 133a183bc3..564ae28a2b 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -101,4 +101,3 @@ __assert_fail (const char *assertion, const char *file, unsigned int line, __assert_fail_base (_("%s%s%s:%u: %s%sAssertion `%s' failed.\n%n"), assertion, file, line, function); } -hidden_def(__assert_fail) diff --git a/elf/Makefile b/elf/Makefile index fd77d0c7c8..3386f0ce77 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1283,6 +1283,7 @@ $(objpfx)dl-allobjs.os: $(all-rtld-routines:%=$(objpfx)%.os) rtld-stubbed-symbols = \ __GI___pthread_disable_asynccancel \ __GI___pthread_enable_asynccancel \ + __libc_assert_fail \ __pthread_disable_asynccancel \ __pthread_enable_asynccancel \ calloc \ diff --git a/include/assert.h b/include/assert.h index 61cc8aa22f..c812808f9b 100644 --- a/include/assert.h +++ b/include/assert.h @@ -20,8 +20,14 @@ extern void __assert_fail_base (const char *fmt, const char *assertion, const char *function) __THROW __attribute__ ((__noreturn__)) attribute_hidden; -# if IS_IN (libc) || (IS_IN (rtld) && !defined NO_RTLD_HIDDEN) -hidden_proto (__assert_fail) -hidden_proto (__assert_perror_fail) +rtld_hidden_proto (__assert_fail) +rtld_hidden_proto (__assert_perror_fail) +libc_hidden_proto (__assert_perror_fail) + + +# if IS_IN (libc) +/* Redirect to the internal version which does not use stderr. */ +extern _Noreturn __typeof (__assert_fail) __libc_assert_fail attribute_hidden; +# define __assert_fail __libc_assert_fail # endif #endif diff --git a/malloc/malloc.c b/malloc/malloc.c index f3320d2663..6f9c3b59b9 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -287,22 +287,6 @@ #define MALLOC_DEBUG 0 #endif -#if IS_IN (libc) -#ifndef NDEBUG -# define __assert_fail(assertion, file, line, function) \ - __malloc_assert(assertion, file, line, function) - -_Noreturn static void -__malloc_assert (const char *assertion, const char *file, unsigned int line, - const char *function) -{ - __libc_message ("Fatal glibc error: malloc assertion failure in %s: %s\n", - function, assertion); - __builtin_unreachable (); -} -#endif -#endif - #if USE_TCACHE /* We want 64 entries. This is an arbitrary limit, which tunables can reduce. */ # define TCACHE_MAX_BINS 64 diff --git a/stdlib/tst-bz20544.c b/stdlib/tst-bz20544.c index 411cd3f3ba..7cc236a1b1 100644 --- a/stdlib/tst-bz20544.c +++ b/stdlib/tst-bz20544.c @@ -78,7 +78,7 @@ test_bz20544_cxa_at_quick_exit (void *closure) static void test_one_fn (void (*test_fn) (void *)) { - const char expected_error[] = "Assertion `func != NULL' failed.\n"; + const char expected_error[] = "assertion failed: func != NULL\n"; struct support_capture_subprocess result; result = support_capture_subprocess (test_fn, NULL); support_capture_subprocess_check (&result, "bz20544", -SIGABRT,