From patchwork Wed Apr 13 13:01:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 52855 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 3EB19385741A for ; Wed, 13 Apr 2022 13:03:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EB19385741A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1649854986; bh=0pu+vzPe8NT8geOTn/YdWZPvQafbmU7LxpMnfnNnzuY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pAVo/1QBhj9ZOb7GHl1XQ/Bze42nVJ0PVjtJ2ut4+cTn9UQKN6ZnZhLTahEwRXvXc 0SDFF4W+WjxTfPe8gMmYB5c4SCWZmDqdrWZtT6dPLKipDsxYW84fgsWDF+jjGRwDRd cdV7kqkbxKvVL13C2Tyqdh8CrHkQzanH3A4tUK5Y= 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 ESMTPS id F267F3857829 for ; Wed, 13 Apr 2022 13:01:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F267F3857829 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-363-IgusSkY-MouKQ9W2pd5FHg-1; Wed, 13 Apr 2022 09:01:55 -0400 X-MC-Unique: IgusSkY-MouKQ9W2pd5FHg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 026713804509 for ; Wed, 13 Apr 2022 13:01:55 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.193.61]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81F1640D282A for ; Wed, 13 Apr 2022 13:01:54 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] elf: Fix memory leak in _dl_find_object_update (bug 29062) Date: Wed, 13 Apr 2022 15:01:53 +0200 Message-ID: <87h76x3zni.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.4 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The count can be zero if an object has already been loaded as an indirect dependency (so that l_searchlist.r_list in its link map is still NULL) is promoted to global scope via RTLD_GLOBAL. Fixes commit 5d28a8962dc ("elf: Add _dl_find_object function"). --- elf/dl-find_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c index 2b8df2fd67..4d5831b6f4 100644 --- a/elf/dl-find_object.c +++ b/elf/dl-find_object.c @@ -788,6 +788,9 @@ _dl_find_object_update (struct link_map *new_map) for (struct link_map *l = new_map; l != NULL; l = l->l_next) /* Skip proxy maps and already-processed maps. */ count += l == l->l_real && !l->l_find_object_processed; + if (count == 0) + return true; + struct link_map **map_array = malloc (count * sizeof (*map_array)); if (map_array == NULL) return false; @@ -797,8 +800,6 @@ _dl_find_object_update (struct link_map *new_map) if (l == l->l_real && !l->l_find_object_processed) map_array[i++] = l; } - if (count == 0) - return true; _dl_find_object_link_map_sort (map_array, count); bool ok = _dl_find_object_update_1 (map_array, count);