From patchwork Thu May 25 15:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1786178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=ikrnakaz; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QRsCw6tzdz20Q1 for ; Fri, 26 May 2023 01:19:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DE8EA3858004 for ; Thu, 25 May 2023 15:19:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE8EA3858004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1685027962; bh=sPy0r1alhsl41c62Uk6nwOvtHg3zr8h3WKuWe+q3Jgo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ikrnakazvucDGRtMcVCgywWOjq0z9ZrQlgUFEFvg1ZPNIm0bxET9ISNEfsSlqZmTQ Mi4RM6xOYnVsMBopwsfoE+dH9VpYIE96D3+BXFJw+LJ/bdzUKr7DXKw8UPutjWnb00 gUILRxyT/XBcBnvcfsu6snIpts/kM4dwQnpP0eXA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from gainsboro.apple.relay.mailchannels.net (gainsboro.apple.relay.mailchannels.net [23.83.208.65]) by sourceware.org (Postfix) with ESMTPS id C6C873858D32 for ; Thu, 25 May 2023 15:19:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C6C873858D32 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 85B6D8C1B2E; Thu, 25 May 2023 15:19:03 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C84F68C18E2 for ; Thu, 25 May 2023 15:19:02 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1685027942; a=rsa-sha256; cv=none; b=rFCcQOy2OUuDBCQVankBYF2U1ZBhG8MB9P3JuMs27+b3X2LbS6YyuZOqgLnDc5UfMdMINm gYKtyEbrh5msC0Ui7rHjymyHZ93Wjgd/tnKYzHZxTkftN829UUebScpIvKy44PSTaknS2M QxpT1iEqyw1NUh+glJSCyFtG8Ty8Vb3r3jxmQ/L+a9EfihQgslgbHDCV4oB7hyGXsrhAzC OgjKGWqS943YAOJ8bwdgyw+tNf16YhOlOvBzgLNKkYCC9G1HGe+goIWjwn8UW77cQFdPZQ obdM/1Gv9JBc6vVHAFqXnPLdfgsGLj3Sm1JKxFNKC0UWi3Hm6w2zAWxNv5Ejew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1685027942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jK/0JEfu+GzmnJiIy9bqFxfzx3Wkqf6wA3xP5TC2EWQ=; b=Rmv8kdyzZtOiLUD591pfSFzfZPV55Yo1NgUqvjHRxnxL7FD3H23/tl0TIqCb4USPTyw7ul EJpMOa8AXs9AR+eiOoLXhiFQGhCMKSd0D1vFqz96n0rTwUTcTzdT9wuIO0YdTNg38JqvTG LJ3jHy74U/rHt/R0BJQoEQ08pYskyDr5diUvr/rCSvDQVK8zhSW9dhzY5E9OPvs11vBmjw 9vmOKOk0WxtfadJu0wxjk+xB4Bo4y8ufDaVrrbnN1j3lwQPVaNeFrZelbrbLTzyZt2YKzt /pOVszaMEXz5ALuHa8QVIKWgJOcXZO3RiyUgiLUjqj05kgCiU+0UE/Kc4hUMsQ== ARC-Authentication-Results: i=1; rspamd-79bb5575d7-r82sw; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Good X-MC-Copy: stored-urls X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Callous-Language: 1c89abd0329733c9_1685027943389_3231140582 X-MC-Loop-Signature: 1685027943389:1336994585 X-MC-Ingress-Time: 1685027943389 Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.97.48.120 (trex/6.8.1); Thu, 25 May 2023 15:19:03 +0000 Received: from fedora.redhat.com (bras-vprn-toroon4834w-lp130-02-142-113-138-85.dsl.bell.ca [142.113.138.85]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a306.dreamhost.com (Postfix) with ESMTPSA id 4QRsCV3fp0z3H for ; Thu, 25 May 2023 08:19:02 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [committed] elf: Update comment in open_path Date: Thu, 25 May 2023 11:18:57 -0400 Message-Id: <20230525151857.2368804-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1172.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_SOFTFAIL, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" f55727ca53308a206cf00d0442f8c57c73761899 updated open_path to use the r_search_path_struct struct but failed to update the comment. Signed-off-by: Siddhesh Poyarekar --- elf/dl-load.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 2aa487b49a..6a0d85eaf8 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1779,12 +1779,11 @@ open_verify (const char *name, int fd, return fd; } -/* Try to open NAME in one of the directories in *DIRSP. - Return the fd, or -1. If successful, fill in *REALNAME - with the malloc'd full directory name. If it turns out - that none of the directories in *DIRSP exists, *DIRSP is - replaced with (void *) -1, and the old value is free()d - if MAY_FREE_DIRS is true. */ +/* Try to open NAME in one of the directories in SPS. Return the fd, or -1. + If successful, fill in *REALNAME with the malloc'd full directory name. If + it turns out that none of the directories in SPS exists, SPS->DIRS is + replaced with (void *) -1, and the old value is free()d if SPS->MALLOCED is + true. */ static int open_path (const char *name, size_t namelen, int mode,