From patchwork Tue Sep 24 12:12:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 97907 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6D3B9385841F for ; Tue, 24 Sep 2024 12:13:45 +0000 (GMT) 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.129.124]) by sourceware.org (Postfix) with ESMTP id CA8D63858D26 for ; Tue, 24 Sep 2024 12:13:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CA8D63858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CA8D63858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727179986; cv=none; b=ihtIE4mbSmOd2cYpAbNACecx/iTe7qrObgfyFBZUftTTgNC/SP02s8YM/hbBZW9XE/0zgldyznKeAE77hd3cXCqc18puEFhleepdLYgYw8aD3h/p6dU1WYYweJSPJVvAYLSxYSI2b3/qsASPe8/d3pdsEct1lMtJmfutoQshnkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727179986; c=relaxed/simple; bh=TPfqV/C0LH8h0eXcmlhYq44/ISeLFKEjKZwY4OBLMuk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=PIfNYpANEcmzUpKlyEjPCwkNkg86xtl82afkyilXx9hbNPKEWyC2AvB/VErJlCgK1EwV2csrBOtobM/ncPCD1C2Hhti5NO8GfR3tTqpIaxlciUeB33LJ5TSzeLKQK2R/8zSDxRQfEKW1X98T+bfTbE1z5cZazNiUmFtR/v8nwYI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727179983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=wVKIuFfgRHxvenml8A6JqCAWDjJVUGc6ecBKrvFpWAs=; b=EzTEmGsIiEVYFFIrgrb6IpIMc6V1iYU64vLWCsvimYMP0oqxBd6QiHhum+MLYAsLKE5EgA +uLcEmW5EU3IW8deZD+6nmQnceGj8dX1+0LP0wmX0n3XFOYTnkYSQUxKv98BgpE5kMlaDj 80UitvAiUnnCcItCkAWcaLnpAWhKBWw= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-UFOjnHhmMd-LpIUvmX0h1w-1; Tue, 24 Sep 2024 08:13:02 -0400 X-MC-Unique: UFOjnHhmMd-LpIUvmX0h1w-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.4]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 80AE118FFA61 for ; Tue, 24 Sep 2024 12:13:01 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.45.225.92]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 373E730001A1; Tue, 24 Sep 2024 12:12:59 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Cc: Joseph Myers Subject: [PATCH v4] Do not export functions from libc Date: Tue, 24 Sep 2024 14:12:56 +0200 Message-ID: <87plotdzcn.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org With the merge of NSS service modules into libc, external users are gone except in tests. To enable tests that use these functions (and the unit tests in malloc/tst-alloc_buffer.h), add a copy of these functions to libsupport. For that to work, do not call __snprintf in __libc_alloc_buffer_create_failure, which is not very useful and unavailable outside libc. This also enables future use of this functionality from ld.so (using a separately built copy). --- v4: This is a merge of the previous two alloc_buffer patches from the RELRO link map series. I removed the unused function arguments from __libc_alloc_buffer_create_failure. include/alloc_buffer.h | 27 ++++++--------------------- malloc/Makefile | 6 ++++-- malloc/Versions | 7 ------- malloc/alloc_buffer_alloc_array.c | 1 - malloc/alloc_buffer_allocate.c | 1 - malloc/alloc_buffer_copy_bytes.c | 1 - malloc/alloc_buffer_copy_string.c | 1 - malloc/alloc_buffer_create_failure.c | 9 ++------- malloc/tst-alloc_buffer.c | 4 ++++ nss/Makefile | 4 ++-- support/Makefile | 1 + support/support-alloc_buffer.c | 26 ++++++++++++++++++++++++++ 12 files changed, 45 insertions(+), 43 deletions(-) base-commit: da29dc24d419656a4a6d6d61598b767b86b1425d diff --git a/include/alloc_buffer.h b/include/alloc_buffer.h index 888b976d37..d35237a3b4 100644 --- a/include/alloc_buffer.h +++ b/include/alloc_buffer.h @@ -113,10 +113,7 @@ enum }; /* Internal function. Terminate the process using __libc_fatal. */ -void __libc_alloc_buffer_create_failure (void *start, size_t size); -#ifndef _ISOMAC -libc_hidden_proto (__libc_alloc_buffer_create_failure) -#endif +void __libc_alloc_buffer_create_failure (void) attribute_hidden; /* Create a new allocation buffer. The byte range from START to START + SIZE - 1 must be valid, and the allocation buffer allocates @@ -128,16 +125,13 @@ alloc_buffer_create (void *start, size_t size) uintptr_t current = (uintptr_t) start; uintptr_t end = (uintptr_t) start + size; if (end < current) - __libc_alloc_buffer_create_failure (start, size); + __libc_alloc_buffer_create_failure (); return (struct alloc_buffer) { current, end }; } /* Internal function. See alloc_buffer_allocate below. */ struct alloc_buffer __libc_alloc_buffer_allocate (size_t size, void **pptr) - __attribute__ ((nonnull (2))); -#ifndef _ISOMAC -libc_hidden_proto (__libc_alloc_buffer_allocate) -#endif + attribute_hidden __attribute__ ((nonnull (2))); /* Allocate a buffer of SIZE bytes using malloc. The returned buffer is in a failed state if malloc fails. *PPTR points to the start of @@ -338,10 +332,7 @@ __alloc_buffer_next (struct alloc_buffer *buf, size_t align) void * __libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t size, size_t align, size_t count) - __attribute__ ((nonnull (1))); -#ifndef _ISOMAC -libc_hidden_proto (__libc_alloc_buffer_alloc_array) -#endif + attribute_hidden __attribute__ ((nonnull (1))); /* Obtain a TYPE * pointer to an array of COUNT objects in BUF of TYPE. Consume these bytes from the buffer. Return NULL and mark @@ -357,10 +348,7 @@ libc_hidden_proto (__libc_alloc_buffer_alloc_array) /* Internal function. See alloc_buffer_copy_bytes below. */ struct alloc_buffer __libc_alloc_buffer_copy_bytes (struct alloc_buffer, const void *, size_t) - __attribute__ ((nonnull (2))); -#ifndef _ISOMAC -libc_hidden_proto (__libc_alloc_buffer_copy_bytes) -#endif + attribute_hidden __attribute__ ((nonnull (2))); /* Copy SIZE bytes starting at SRC into the buffer. If there is not enough room in the buffer, the buffer is marked as failed. No @@ -374,10 +362,7 @@ alloc_buffer_copy_bytes (struct alloc_buffer *buf, const void *src, size_t size) /* Internal function. See alloc_buffer_copy_string below. */ struct alloc_buffer __libc_alloc_buffer_copy_string (struct alloc_buffer, const char *) - __attribute__ ((nonnull (2))); -#ifndef _ISOMAC -libc_hidden_proto (__libc_alloc_buffer_copy_string) -#endif + attribute_hidden __attribute__ ((nonnull (2))); /* Copy the string at SRC into the buffer, including its null terminator. If there is not enough room in the buffer, the buffer diff --git a/malloc/Makefile b/malloc/Makefile index 1630aaf6ac..27f2cda4d4 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -30,7 +30,6 @@ tests := \ tst-aligned-alloc-random \ tst-aligned-alloc-random-thread \ tst-aligned-alloc-random-thread-cross \ - tst-alloc_buffer \ tst-calloc \ tst-free-errno \ tst-interpose-nothread \ @@ -83,7 +82,10 @@ tests += \ # tests endif -tests-internal := tst-scratch_buffer +tests-internal := \ + tst-alloc_buffer \ + tst-scratch_buffer \ + # tests-internal # The dynarray framework is only available inside glibc. tests-internal += \ diff --git a/malloc/Versions b/malloc/Versions index c763395c6d..011b6a5a85 100644 --- a/malloc/Versions +++ b/malloc/Versions @@ -88,13 +88,6 @@ libc { __libc_dynarray_finalize; __libc_dynarray_resize; __libc_dynarray_resize_clear; - - # struct alloc_buffer support - __libc_alloc_buffer_alloc_array; - __libc_alloc_buffer_allocate; - __libc_alloc_buffer_copy_bytes; - __libc_alloc_buffer_copy_string; - __libc_alloc_buffer_create_failure; } } diff --git a/malloc/alloc_buffer_alloc_array.c b/malloc/alloc_buffer_alloc_array.c index 31cb9ec6a4..7b4a9d69ab 100644 --- a/malloc/alloc_buffer_alloc_array.c +++ b/malloc/alloc_buffer_alloc_array.c @@ -43,4 +43,3 @@ __libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t element_size, return NULL; } } -libc_hidden_def (__libc_alloc_buffer_alloc_array) diff --git a/malloc/alloc_buffer_allocate.c b/malloc/alloc_buffer_allocate.c index a121d1d02e..0f4101d401 100644 --- a/malloc/alloc_buffer_allocate.c +++ b/malloc/alloc_buffer_allocate.c @@ -33,4 +33,3 @@ __libc_alloc_buffer_allocate (size_t size, void **pptr) else return alloc_buffer_create (*pptr, size); } -libc_hidden_def (__libc_alloc_buffer_allocate) diff --git a/malloc/alloc_buffer_copy_bytes.c b/malloc/alloc_buffer_copy_bytes.c index 69348e6b65..5f55337c18 100644 --- a/malloc/alloc_buffer_copy_bytes.c +++ b/malloc/alloc_buffer_copy_bytes.c @@ -31,4 +31,3 @@ __libc_alloc_buffer_copy_bytes (struct alloc_buffer buf, memcpy (ptr, src, len); return buf; } -libc_hidden_def (__libc_alloc_buffer_copy_bytes) diff --git a/malloc/alloc_buffer_copy_string.c b/malloc/alloc_buffer_copy_string.c index 035e2f1e40..d3addc9036 100644 --- a/malloc/alloc_buffer_copy_string.c +++ b/malloc/alloc_buffer_copy_string.c @@ -27,4 +27,3 @@ __libc_alloc_buffer_copy_string (struct alloc_buffer buf, const char *src) { return __libc_alloc_buffer_copy_bytes (buf, src, strlen (src) + 1); } -libc_hidden_def (__libc_alloc_buffer_copy_string) diff --git a/malloc/alloc_buffer_create_failure.c b/malloc/alloc_buffer_create_failure.c index b456c6312a..a52ea10c75 100644 --- a/malloc/alloc_buffer_create_failure.c +++ b/malloc/alloc_buffer_create_failure.c @@ -20,12 +20,7 @@ #include void -__libc_alloc_buffer_create_failure (void *start, size_t size) +__libc_alloc_buffer_create_failure (void) { - char buf[200]; - __snprintf (buf, sizeof (buf), "Fatal glibc error: " - "invalid allocation buffer of size %zu\n", - size); - __libc_fatal (buf); + __libc_fatal ("Fatal glibc error: invalid allocation buffer\n"); } -libc_hidden_def (__libc_alloc_buffer_create_failure) diff --git a/malloc/tst-alloc_buffer.c b/malloc/tst-alloc_buffer.c index 97a60b0444..8379c97825 100644 --- a/malloc/tst-alloc_buffer.c +++ b/malloc/tst-alloc_buffer.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +/* Note: This test exercises the (identical) copy of the + in libsupport, not libc.so, because the latter has + hidden visibility and cannot be tested from the outside. */ + #include #include #include diff --git a/nss/Makefile b/nss/Makefile index 9331b3308c..baad07918c 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -475,9 +475,9 @@ libof-nss_test1 = extramodules libof-nss_test2 = extramodules libof-nss_test_errno = extramodules libof-nss_test_gai_hv2_canonname = extramodules -$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) +$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(libsupport) $(link-libc-deps) $(build-module) -$(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) +$(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(libsupport) $(link-libc-deps) $(build-module) $(objpfx)/libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps) $(build-module) diff --git a/support/Makefile b/support/Makefile index 84e2419775..87f61289c1 100644 --- a/support/Makefile +++ b/support/Makefile @@ -41,6 +41,7 @@ libsupport-routines = \ resolv_response_context_free \ resolv_test \ set_fortify_handler \ + support-alloc_buffer \ support-open-dev-null-range \ support_become_root \ support_can_chroot \ diff --git a/support/support-alloc_buffer.c b/support/support-alloc_buffer.c new file mode 100644 index 0000000000..11f967295c --- /dev/null +++ b/support/support-alloc_buffer.c @@ -0,0 +1,26 @@ +/* Make available to tests. + Copyright (C) 2023 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 + . */ + +/* The implementation in libc.so has hidden visibility and is + therefore not usable. */ + +#include +#include +#include +#include +#include