More accurate computatin of reclen in readdir_r.

Alignment issue can increase the reclen limit.
Make sure Linux 64-bit readdir_r also accounts for 64-bit alignment
in getdents.

(cherry picked from commit db753e2cfb2051ebf20dc089f87c5b1297cc2cff)

diff --git a/ChangeLog b/ChangeLog
index bcd3e2f174d368490c77e38ed62e795a7ed73730..08b6c1c98d90bc20aed50db475a5659a9ccefde7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-19  Ulrich Drepper  <drepper@gmail.com>
+
+       * sysdeps/unix/readdir_r.c (__READDIR_R): Compute reclen more accurate.
+       * sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c: Define
+       GETDENTS_64BIT_ALIGNED.
+
 2010-12-10  Andreas Schwab  <schwab@redhat.com>
 
        * wcsmbs/wchar.h (wcpcpy, wcpncpy): Add __restrict.

diff --git a/sysdeps/unix/readdir_r.c b/sysdeps/unix/readdir_r.c
index 93727912c1709b8d4d9ddf7a246b8b0d5c2e6c22..e166174883b04eb0413008ea43de5392206272e4 100644 (file)
--- a/sysdeps/unix/readdir_r.c
+++ b/sysdeps/unix/readdir_r.c
@@ -117,7 +117,8 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
 #ifdef GETDENTS_64BIT_ALIGNED
       /* The d_reclen value might include padding which is not part of
         the DIRENT_TYPE data structure.  */
-      reclen = MIN (reclen, sizeof (DIRENT_TYPE));
+      reclen = MIN (reclen,
+                   offsetof (DIRENT_TYPE, d_name) + sizeof (dp->d_name));
 #endif
       *result = memcpy (entry, dp, reclen);
 #ifdef GETDENTS_64BIT_ALIGNED

diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
index adb92db6af9cb90c321f8b9bf1757836d6715141..12ca1a1ef7412e611e9cc2f9810320718a334cba 100644 (file)
--- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
@@ -1,4 +1,5 @@
 #define readdir64_r __no_readdir64_r_decl
+#define GETDENTS_64BIT_ALIGNED 1
 #include <sysdeps/unix/readdir_r.c>
 #undef readdir64_r
 weak_alias (__readdir_r, readdir64_r)