From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id E7F293858D39; Mon, 24 Jan 2022 16:15:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7F293858D39 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] realpath: Avoid overwriting preexisting error (CVE-2021-3998) X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 472e799a5f2102bc0c3206dbd5a801765fceb39c X-Git-Newrev: d084965adc7baa8ea804427cccf973cea556d697 Message-Id: <20220124161535.E7F293858D39@sourceware.org> Date: Mon, 24 Jan 2022 16:15:35 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2022 16:15:36 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d084965adc7baa8ea804427cccf973cea556d697 commit d084965adc7baa8ea804427cccf973cea556d697 Author: Siddhesh Poyarekar Date: Mon Jan 24 21:36:41 2022 +0530 realpath: Avoid overwriting preexisting error (CVE-2021-3998) Set errno and failure for paths that are too long only if no other error occurred earlier. Related: BZ #28770 Reviewed-by: Andreas Schwab Signed-off-by: Siddhesh Poyarekar (cherry picked from commit 84d2d0fe20bdf94feed82b21b4d7d136db471f03) Diff: --- stdlib/canonicalize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 7a23a51b3a..e2d4244fc7 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);