From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from buffalo.birch.relay.mailchannels.net (buffalo.birch.relay.mailchannels.net [23.83.209.24]) by sourceware.org (Postfix) with ESMTPS id BFE4B3858D39 for ; Mon, 24 Jan 2022 14:25:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BFE4B3858D39 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 CB39662270C; Mon, 24 Jan 2022 14:25:08 +0000 (UTC) Received: from pdx1-sub0-mail-a304.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 5218D622612; Mon, 24 Jan 2022 14:25:06 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a304.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.126.0.25 (trex/6.4.3); Mon, 24 Jan 2022 14:25:08 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Towering-Trail: 34f940fd62ef6678_1643034308691_187952478 X-MC-Loop-Signature: 1643034308691:2158097469 X-MC-Ingress-Time: 1643034308691 Received: from [192.168.1.174] (unknown [1.186.122.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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-a304.dreamhost.com (Postfix) with ESMTPSA id 4JjC1Y3BZ2z1N9; Mon, 24 Jan 2022 06:25:05 -0800 (PST) Message-ID: <04d2ba44-807a-a0c4-2779-22499e452c82@sourceware.org> Date: Mon, 24 Jan 2022 19:55:00 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH v3 2/3] realpath: Set errno to ENAMETOOLONG for result larger than PATH_MAX [BZ #28770] Content-Language: en-US To: Andreas Schwab , Siddhesh Poyarekar via Libc-alpha Cc: fweimer@redhat.com References: <20220119082147.3352868-1-siddhesh@sourceware.org> <20220120093252.1911498-1-siddhesh@sourceware.org> <20220120093252.1911498-3-siddhesh@sourceware.org> <87r18x8cxp.fsf@igel.home> From: Siddhesh Poyarekar In-Reply-To: <87r18x8cxp.fsf@igel.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3494.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, NICE_REPLY_A, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP 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-List-Received-Date: Mon, 24 Jan 2022 14:25:17 -0000 On 24/01/2022 19:15, Andreas Schwab wrote: > On Jan 20 2022, Siddhesh Poyarekar via Libc-alpha wrote: > >> diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c >> index f36bdf4c76..732dc7ea46 100644 >> --- a/stdlib/canonicalize.c >> +++ b/stdlib/canonicalize.c >> @@ -400,8 +400,16 @@ realpath_stk (const char *name, char *resolved, >> >> error: >> *dest++ = '\0'; >> - if (resolved != NULL && dest - rname <= get_path_max ()) >> - rname = strcpy (resolved, rname); >> + if (resolved != NULL) >> + { >> + if (dest - rname <= get_path_max ()) >> + rname = strcpy (resolved, rname); >> + else >> + { >> + failed = true; >> + __set_errno (ENAMETOOLONG); >> + } >> + } > > Shouldn't that preserve any preexisting error? like this? diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 732dc7ea46..6caed9e70e 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -404,7 +404,7 @@ error: { if (dest - rname <= get_path_max ()) rname = strcpy (resolved, rname); - else + else if (!failed) { failed = true; __set_errno (ENAMETOOLONG); > I think the result > should only be copied if !failed. > Looks like tests in test-canon.c depend on buf contents having being copied in despite failure. Siddhesh