93dc2d
commit d084965adc7baa8ea804427cccf973cea556d697
93dc2d
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
93dc2d
Date:   Mon Jan 24 21:36:41 2022 +0530
93dc2d
93dc2d
    realpath: Avoid overwriting preexisting error (CVE-2021-3998)
93dc2d
    
93dc2d
    Set errno and failure for paths that are too long only if no other error
93dc2d
    occurred earlier.
93dc2d
    
93dc2d
    Related: BZ #28770
93dc2d
    
93dc2d
    Reviewed-by: Andreas Schwab <schwab@linux-m68k.org>
93dc2d
    Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
93dc2d
    (cherry picked from commit 84d2d0fe20bdf94feed82b21b4d7d136db471f03)
93dc2d
93dc2d
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
93dc2d
index 7a23a51b3a395eb3..e2d4244fc7b8fa25 100644
93dc2d
--- a/stdlib/canonicalize.c
93dc2d
+++ b/stdlib/canonicalize.c
93dc2d
@@ -404,7 +404,7 @@ error:
93dc2d
     {
93dc2d
       if (dest - rname <= get_path_max ())
93dc2d
 	rname = strcpy (resolved, rname);
93dc2d
-      else
93dc2d
+      else if (!failed)
93dc2d
 	{
93dc2d
 	  failed = true;
93dc2d
 	  __set_errno (ENAMETOOLONG);