Attachment 302443 Details for Bug 296631 – backported patch

[patch] backported patch

bz296631.patch (text/plain), 2.21 KB, created by Vitezslav Crhonek on 2008-04-15 12:36:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vitezslav Crhonek

Created: 2008-04-15 12:36:02 UTC

Size: 2.21 KB

patch

obsolete

>diff -up findutils-4.2.27/find/find.c_old findutils-4.2.27/find/find.c
>--- findutils-4.2.27/find/find.c_old	2008-04-14 17:08:24.000000000 +0200
>+++ findutils-4.2.27/find/find.c	2008-04-14 15:23:01.000000000 +0200
>@@ -1096,7 +1094,8 @@ enum SafeChdirStatus
>     SafeChdirFailStat,
>     SafeChdirFailWouldBeUnableToReturn,
>     SafeChdirFailChdirFailed,
>-    SafeChdirFailNonexistent
>+    SafeChdirFailNonexistent,
>+    SafeChdirFailDestUnreadable
>   };
> 
> /* Safely perform a change in directory.  We do this by calling
>@@ -1362,7 +1361,7 @@ safely_chdir_nofollow(const char *dest,
> 	case ENOENT:
> 	  return SafeChdirFailNonexistent;
> 	default:
>-	  return SafeChdirFailChdirFailed;
>+	  return SafeChdirFailDestUnreadable;
> 	}
>     }
>   
>@@ -1410,9 +1409,29 @@ safely_chdir(const char *dest,
> 
> #if defined(O_NOFOLLOW)
>   if (options.open_nofollow_available)
>-    return safely_chdir_nofollow(dest, direction, statbuf_dest, symlink_follow_option, did_stat);
>+    {
>+      enum SafeChdirStatus result;
>+      result = safely_chdir_nofollow(dest, direction, statbuf_dest,
>+				     symlink_follow_option, did_stat);
>+      if (SafeChdirFailDestUnreadable != result)
>+	{
>+	  return result;
>+	}
>+      else
>+	{
>+	  /* Savannah bug #15384: fall through to use safely_chdir_lstat
>+	   * if the directory is not readable. 
>+	   */
>+	  /* Do nothing. */
>+	}
>+    }
> #endif
>-  return safely_chdir_lstat(dest, direction, statbuf_dest, symlink_follow_option, did_stat);
>+  /* Even if O_NOFOLLOW is available, we may need to use the alternative 
>+   * method, since parent of the start point may be executable but not 
>+   * readable. 
>+   */
>+  return safely_chdir_lstat(dest, direction, statbuf_dest,
>+			    symlink_follow_option, did_stat);
> }
> 
> 
>@@ -1990,6 +2009,7 @@ process_dir (char *pathname, char *name,
> 	      break;
> 	      
> 	    case SafeChdirFailNonexistent:
>+	    case SafeChdirFailDestUnreadable:
> 	    case SafeChdirFailStat:
> 	    case SafeChdirFailNotDir:
> 	    case SafeChdirFailChdirFailed:
>@@ -2112,6 +2132,7 @@ process_dir (char *pathname, char *name,
> 	      return;
> 	      
> 	    case SafeChdirFailNonexistent:
>+	    case SafeChdirFailDestUnreadable:
> 	    case SafeChdirFailStat:
> 	    case SafeChdirFailSymlink:
> 	    case SafeChdirFailNotDir:

Actions: View | Diff

Attachments on bug 296631: 302443