Fix file descriotor leak in nftw with FTW_CHDIR

(cherry picked from commit 247fdf2e2b798378d8aeaac1ee6f4ba0a49f31f3)

diff --git a/ChangeLog b/ChangeLog
index a63f1b9036715aeac29b8c6eb6eb6dfda3175106..6a0f4c0a70a84d7f8f740b3af3fab9e7ae612fac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-10  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #11271]
+       * io/ftw.c (ftw_startup): Close descriptor for initial directory
+       after changing back to it.
+
 2010-02-09  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/i386/lshift.S: Fix unwind information.

diff --git a/io/ftw.c b/io/ftw.c
index 9cc09077ed1c9fbf3b0223721ad4b0518eb23e49..bb7dba8ca87bb945b945012fd9fba5d0ba06540f 100644 (file)
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -1,5 +1,5 @@
 /* File tree walker functions.
-   Copyright (C) 1996-2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1996-2004, 2006-2008, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -790,6 +790,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
     {
       int save_err = errno;
       __fchdir (cwdfd);
+      close_not_cancel_no_status (cwdfd);
       __set_errno (save_err);
     }
   else if (cwd != NULL)