From patchwork Mon Jun 22 15:13:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39735 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 83DF638930C7; Mon, 22 Jun 2020 15:13:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83DF638930C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592838828; bh=npTgw8Ihbrp0zW7+gfXQJcovDdUVIJTTlCEdSJBED9g=; 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=jmo3Qin3yJrZ82amz6BObga0XVWOile9k2WoujTQzWBwIoYl9/xHLoIVCnQ0dZXIR fmeK+A7EllhRXVySszPNn9GTm7bVQSYFA9PDiIy6ycqqHVWuD1jTlexo6KTH5nIT1a 9O95qLoOfdyM5hbYujgB4RriUXojbU5FyDMYBpa4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id D5ACE388B033 for ; Mon, 22 Jun 2020 15:13:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D5ACE388B033 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-D6Fys15SNNmVuRtT8eYW6A-1; Mon, 22 Jun 2020 11:13:32 -0400 X-MC-Unique: D6Fys15SNNmVuRtT8eYW6A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85011108598C for ; Mon, 22 Jun 2020 15:13:27 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-185.ams2.redhat.com [10.36.112.185]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0805371682 for ; Mon, 22 Jun 2020 15:13:26 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 04/30] elf: Implement __rtld_malloc_is_full In-Reply-To: References: Message-Id: Date: Mon, 22 Jun 2020 17:13:25 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@sourceware.org Sender: "Libc-alpha" In some cases, it is difficult to determine the kind of malloc based on the execution context, so a function to determine that is helpful. --- elf/dl-minimal.c | 8 ++++++++ include/rtld-malloc.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index 7c64e24c87..dc79f02458 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -59,6 +59,14 @@ __rtld_malloc_init_stubs (void) __rtld_realloc = &rtld_realloc; } +bool +__rtld_malloc_is_full (void) +{ + /* The caller assumes that there is an active malloc. */ + assert (__rtld_malloc != NULL); + return __rtld_malloc != &rtld_malloc; +} + /* Lookup NAME at VERSION in the scope of MATCH. */ static void * lookup_malloc_symbol (struct link_map *main_map, const char *name, diff --git a/include/rtld-malloc.h b/include/rtld-malloc.h index b026a3270c..54f53f7888 100644 --- a/include/rtld-malloc.h +++ b/include/rtld-malloc.h @@ -66,6 +66,10 @@ realloc (void *ptr, size_t size) implementation. */ void __rtld_malloc_init_stubs (void) attribute_hidden; +/* Return false if the active malloc is the ld.so minimal malloc, true + if it is the full implementation from libc.so. */ +_Bool __rtld_malloc_is_full (void) attribute_hidden; + /* Called shortly before the final self-relocation (when RELRO variables are still writable) to activate the real malloc implementation. MAIN_MAP is the link map of the executable. */