public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Siddhesh Poyarekar <siddhesh@sourceware.org>
To: libc-alpha@sourceware.org
Cc: Andreas Schwab <schwab@linux-m68k.org>
Subject: [committed] realpath: Avoid overwriting preexisting error (CVE-2021-3998)
Date: Mon, 24 Jan 2022 21:38:25 +0530	[thread overview]
Message-ID: <20220124160825.3777358-1-siddhesh@sourceware.org> (raw)
In-Reply-To: <87a6fl885q.fsf@igel.home>

Set errno and failure for paths that are too long only if no other error
occurred earlier.

Related: BZ #28770

Reviewed-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
 stdlib/canonicalize.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.34.1


  reply	other threads:[~2022-01-24 16:18 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-19  8:21 [PATCH v2 0/3] Fixes for CVE-2021-3998 and CVE-2021-3999 Siddhesh Poyarekar
2022-01-19  8:21 ` [PATCH v2 1/3] support: Add helpers to create paths longer than PATH_MAX Siddhesh Poyarekar
2022-01-19 10:13   ` Siddhesh Poyarekar
2022-01-20 14:47     ` Cristian Rodríguez
2022-01-20 14:56       ` Florian Weimer
2022-01-20 15:17         ` Cristian Rodríguez
2022-01-20 14:57       ` Siddhesh Poyarekar
2022-01-19  8:21 ` [PATCH v2 2/3] realpath: Set errno to ENAMETOOLONG for result larger than PATH_MAX (CVE-2021-3998) Siddhesh Poyarekar
2022-01-19  8:21 ` [PATCH v2 3/3] getcwd: Set errno to ERANGE for size == 1 (CVE-2021-3999) Siddhesh Poyarekar
2022-01-20  9:32 ` [PATCH v3 0/3] Fixes for CVE-2021-3998 and CVE-2021-3999 Siddhesh Poyarekar
2022-01-20  9:32   ` [PATCH v3 1/3] support: Add helpers to create paths longer than PATH_MAX Siddhesh Poyarekar
2022-01-21 16:27     ` Adhemerval Zanella
2022-01-20  9:32   ` [PATCH v3 2/3] realpath: Set errno to ENAMETOOLONG for result larger than PATH_MAX [BZ #28770] Siddhesh Poyarekar
2022-01-21 23:22     ` Joseph Myers
2022-01-22  3:47       ` Siddhesh Poyarekar
2022-01-22 14:45       ` [PATCH] tst-realpath-toolong: Fix hurd build Siddhesh Poyarekar
2022-01-23  0:36         ` Samuel Thibault
2022-01-23 15:19           ` Siddhesh Poyarekar
2022-01-23 15:33             ` Samuel Thibault
2022-01-24  6:00               ` [committed v2] " Siddhesh Poyarekar
2022-01-24 13:45     ` [PATCH v3 2/3] realpath: Set errno to ENAMETOOLONG for result larger than PATH_MAX [BZ #28770] Andreas Schwab
2022-01-24 14:25       ` Siddhesh Poyarekar
2022-01-24 14:48         ` Andreas Schwab
2022-01-24 14:59           ` Siddhesh Poyarekar
2022-01-24 15:28             ` Andreas Schwab
2022-01-24 16:08               ` Siddhesh Poyarekar [this message]
2022-01-20  9:32   ` [PATCH v3 3/3] getcwd: Set errno to ERANGE for size == 1 (CVE-2021-3999) Siddhesh Poyarekar
2022-01-20 13:32     ` Andreas Schwab
2022-01-21 16:41     ` Adhemerval Zanella
2022-01-21 17:26       ` Siddhesh Poyarekar
2022-01-21 17:31         ` Adhemerval Zanella
2022-01-21 17:38       ` [PATCH v4] " Siddhesh Poyarekar
2022-01-21 17:59         ` Andreas Schwab
2022-01-21 18:02           ` Siddhesh Poyarekar
2022-01-21 18:04       ` [PATCH v5] " Siddhesh Poyarekar
2022-01-24  6:03         ` Siddhesh Poyarekar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220124160825.3777358-1-siddhesh@sourceware.org \
    --to=siddhesh@sourceware.org \
    --cc=libc-alpha@sourceware.org \
    --cc=schwab@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).