From: Aurelien Jarno <aurelien@aurel32.net>
To: libc-stable@sourceware.org
Cc: Siddhesh Poyarekar <siddhesh@sourceware.org>,
Andreas Schwab <schwab@linux-m68k.org>
Subject: [COMMITTED 2.33 6/7] realpath: Avoid overwriting preexisting error (CVE-2021-3998)
Date: Mon, 24 Jan 2022 23:48:56 +0100 [thread overview]
Message-ID: <20220124224857.3799610-6-aurelien@aurel32.net> (raw)
In-Reply-To: <20220124224857.3799610-1-aurelien@aurel32.net>
From: Siddhesh Poyarekar <siddhesh@sourceware.org>
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>
(cherry picked from commit 84d2d0fe20bdf94feed82b21b4d7d136db471f03)
---
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);
--
2.34.1
next prev parent reply other threads:[~2022-01-24 22:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 22:48 [COMMITTED 2.33 1/7] support: Add helpers to create paths longer than PATH_MAX Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 2/7] realpath: Set errno to ENAMETOOLONG for result larger than PATH_MAX [BZ #28770] Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 3/7] tst-realpath-toolong: Fix hurd build Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 4/7] support: Add xclone Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 5/7] getcwd: Set errno to ERANGE for size == 1 (CVE-2021-3999) Aurelien Jarno
2022-01-24 22:48 ` Aurelien Jarno [this message]
2022-01-24 22:48 ` [COMMITTED 2.33 7/7] Linux: Detect user namespace support in io/tst-getcwd-smallbuff Aurelien Jarno
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=20220124224857.3799610-6-aurelien@aurel32.net \
--to=aurelien@aurel32.net \
--cc=libc-stable@sourceware.org \
--cc=schwab@linux-m68k.org \
--cc=siddhesh@sourceware.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).