From patchwork Thu Dec 7 10:31:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 81630 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 F374E385E012 for ; Thu, 7 Dec 2023 10:31:24 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id 3EB11385B537 for ; Thu, 7 Dec 2023 10:31:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3EB11385B537 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 3EB11385B537 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701945072; cv=none; b=aIZGJQga0HR8S1T8Hrhtp/VJKhjhbmIKWluJ0QuHEPYRgf+XaMfuHjIW0ink+wzQq2fQyioxrZQ51NlusNB6UrceUVx1bksGTFySEeSc5/zo4Jz1x2ZMaDvQvgJpPp5sqd++RTX3EF7Iu40qFmaDrIL0vJyxiDpiTUu34a37r5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701945072; c=relaxed/simple; bh=5Gmfz08+jPRqcbVxADT+lxu3v2JlMRPPf2WkKz5u8gE=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=RT6iMPgnO3Z4QtuCit+lF9GdXachZlcpPvDbnaeXjEd9XBgHsSfJCNV4/JQG67K2VXTVd+ajdbN37+8axETw1aRYFvGIzOGDTsCC5C+GeJfUBAZrv0JgyxNAFqU2YOt6J1O7ZMtP32khq2YVSBwwbDEbctbcEhmoiizlzBuQFjQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701945069; 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=sPKsURh+qU0xsWMvygITw5UlQ5YGIEEG1vrFZNvZpkY=; b=QtTXK7OjZOxyiEjdY+Qor4R5rpSVS8o0eds3/q1Rcjhc0Ov4Pv/OWd7AvNcb2Ok91r2Rh2 Y676ulncJLi+k1FYreOWrE1zMwqTL36YUM6dHMr/gX6hb2PsoyNh9z20imafBh7guWFked aOPic66Fp4BFJloXV+ahYUzDIcL5uys= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-QWS0lIw1M4aFBjPUEelSsw-1; Thu, 07 Dec 2023 05:31:08 -0500 X-MC-Unique: QWS0lIw1M4aFBjPUEelSsw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88F6D3C100A0 for ; Thu, 7 Dec 2023 10:31:08 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2CEA3492C29 for ; Thu, 7 Dec 2023 10:31:07 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v3 03/32] elf: Remove _dl_sysdep_open_object hook function In-Reply-To: Message-ID: <659f5e52d04c2293d020eda2827212186dfbf92d.1701944612.git.fweimer@redhat.com> References: X-From-Line: 659f5e52d04c2293d020eda2827212186dfbf92d Mon Sep 17 00:00:00 2001 Date: Thu, 07 Dec 2023 11:31:06 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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, 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 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 It is currently not used by any target. --- elf/dl-load.c | 15 --------------- elf/dl-sysdep-open.h | 45 -------------------------------------------- 2 files changed, 60 deletions(-) delete mode 100644 elf/dl-sysdep-open.h diff --git a/elf/dl-load.c b/elf/dl-load.c index 25ea4f7a4e..692c9a47ad 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -72,7 +72,6 @@ struct filebuf #include #include #include -#include #include #include @@ -2091,20 +2090,6 @@ _dl_map_object (struct link_map *loader, const char *name, &loader->l_runpath_dirs, &realname, &fb, loader, LA_SER_RUNPATH, &found_other_class); - if (fd == -1) - { - realname = _dl_sysdep_open_object (name, namelen, &fd); - if (realname != NULL) - { - fd = open_verify (realname, fd, - &fb, loader ?: GL(dl_ns)[nsid]._ns_loaded, - LA_SER_CONFIG, mode, &found_other_class, - false); - if (fd == -1) - free (realname); - } - } - #ifdef USE_LDCONFIG if (fd == -1 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) diff --git a/elf/dl-sysdep-open.h b/elf/dl-sysdep-open.h deleted file mode 100644 index 185d6c72ab..0000000000 --- a/elf/dl-sysdep-open.h +++ /dev/null @@ -1,45 +0,0 @@ -/* System-specific call to open a shared object by name. Stub version. - Copyright (C) 2015-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 - . */ - -#ifndef _DL_SYSDEP_OPEN_H -#define _DL_SYSDEP_OPEN_H 1 - -#include -#include - -/* NAME is a name without slashes, as it appears in a DT_NEEDED entry - or a dlopen call's argument or suchlike. NAMELEN is (strlen (NAME) + 1). - - Find NAME in an OS-dependent fashion, and return its "real" name. - Optionally fill in *FD with a file descriptor open on that file (or - else leave its initial value of -1). The return value is a new - malloc'd string, which will be free'd by the caller. If NAME is - resolved to an actual file that can be opened, then the return - value should name that file (and if *FD was not set, then a normal - __open call on that string will be made). If *FD was set by some - other means than a normal open and there is no "real" name to use, - then __strdup (NAME) is fine (modulo error checking). */ - -static inline char * -_dl_sysdep_open_object (const char *name, size_t namelen, int *fd) -{ - assert (*fd == -1); - return NULL; -} - -#endif /* dl-sysdep-open.h */