From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 DB99138555B3 for ; Tue, 4 Jul 2023 20:03:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB99138555B3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688501028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mUop/9KIG0iOpOBi2Xh9q8FQ/kehSlGaKvyO17SvWg8=; b=cw6omojriIOIvQ0qXSJzGj1gypCMNGz/NnycoNlD1Jlg3PkGZgHA/H4bADp2XDpjjkZC/w 7ICoYiVUB8fYe9j62qUSab8BkrwzHNK1cGZnTMzJY88pL1pRKtny1ciNf9A2MIasx1UthJ sC0slrgEq7Bae89jzn+b1MEzFar9AZI= 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-460-0TKsxBvaNbmllyrBS5pVGg-1; Tue, 04 Jul 2023 16:03:47 -0400 X-MC-Unique: 0TKsxBvaNbmllyrBS5pVGg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A5018022EF for ; Tue, 4 Jul 2023 20:03:47 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8CB4F1121314 for ; Tue, 4 Jul 2023 20:03:46 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 20/33] elf: Split _dl_lookup_map, _dl_map_new_object from _dl_map_object In-Reply-To: Message-ID: <3d0a55fb87d127a3794fba7032a902663393d1ba.1688499219.git.fweimer@redhat.com> References: X-From-Line: 3d0a55fb87d127a3794fba7032a902663393d1ba Mon Sep 17 00:00:00 2001 Date: Tue, 04 Jul 2023 22:03:44 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-10.5 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: So that they can eventually be called separately from dlopen. --- elf/dl-load.c | 43 ++++++++++++++++++++++++++------------ sysdeps/generic/ldsodefs.h | 13 ++++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 8867fab6bc..f78e23f34a 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1901,24 +1901,14 @@ open_path (const char *name, size_t namelen, int mode, return -1; } -/* Map in the shared object file NAME. */ - struct link_map_private * -_dl_map_object (struct link_map_private *loader, const char *name, - int type, int trace_mode, int mode, Lmid_t nsid) +_dl_lookup_map (Lmid_t nsid, const char *name) { - int fd; - const char *origname = NULL; - char *realname; - char *name_copy; - struct link_map_private *l; - struct filebuf fb; - assert (nsid >= 0); assert (nsid < GL(dl_nns)); - /* Look for this name among those already loaded. */ - for (l = GL(dl_ns)[nsid]._ns_loaded; l; l = l_next (l)) + for (struct link_map_private *l = GL(dl_ns)[nsid]._ns_loaded; + l != NULL; l = l_next (l)) { /* If the requested name matches the soname of a loaded object, use that object. Elide this check for names that have not @@ -1947,6 +1937,22 @@ _dl_map_object (struct link_map_private *loader, const char *name, return l; } + return NULL; +} + +/* Map in the shared object file NAME. */ + +struct link_map_private * +_dl_map_new_object (struct link_map_private *loader, const char *name, + int type, int trace_mode, int mode, Lmid_t nsid) +{ + int fd; + const char *origname = NULL; + char *realname; + char *name_copy; + struct link_map_private *l; + struct filebuf fb; + /* Display information if we are debugging. */ if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES) && loader != NULL) @@ -2201,6 +2207,17 @@ _dl_map_object (struct link_map_private *loader, const char *name, type, mode, &stack_end, nsid); } +struct link_map_private * +_dl_map_object (struct link_map_private *loader, const char *name, + int type, int trace_mode, int mode, Lmid_t nsid) +{ + struct link_map_private *l = _dl_lookup_map (nsid, name); + if (l != NULL) + return l; + return _dl_map_new_object (loader, name, type, trace_mode, mode, nsid); +} + + struct add_path_state { bool counting; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index cdba342f99..0af430a266 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -908,6 +908,11 @@ int _dl_catch_exception (struct dl_exception *exception, void (*operate) (void *), void *args); rtld_hidden_proto (_dl_catch_exception) +/* Search NSID for a map with NAME. If no such map is already loaded, + return NULL. */ +struct link_map_private *_dl_lookup_map (Lmid_t nsid, const char *name) + attribute_hidden; + /* Open the shared object NAME and map in its segments. LOADER's DT_RPATH is used in searching for NAME. If the object is already opened, returns its existing map. */ @@ -916,6 +921,14 @@ struct link_map_private *_dl_map_object (struct link_map_private * loader, int type, int trace_mode, int mode, Lmid_t nsid) attribute_hidden; +/* Like _dl_map_object, but assumes that NAME has not been loaded yet + (_dl_lookmap returned NULL). */ +struct link_map_private *_dl_map_new_object (struct link_map_private * loader, + const char *name, + int type, int trace_mode, int mode, + Lmid_t nsid) attribute_hidden; + + /* Call _dl_map_object on the dependencies of MAP, and set up MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously loaded objects that will be inserted into MAP->l_searchlist after MAP -- 2.41.0