This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Fix readdir_r with long file names


On 03/01/2016 02:16 PM, Florian Weimer wrote:
Why not use a flexible array member for this?
For which part, and how exactly?

Something like the attached patch, say.  (Totally untested.)

You can't put a flexible array member into a transparent union.

That's OK. Any such usage of struct dirent would be unportable anyway.

If you mean to add some zero-width padding member at the end of the
struct, after the d_name member, then I'm worried that makes overrunning
the d_name array member even more undefined than it already is.

No, no padding member, just use C99 the way it was designed. This should improve overrun detection in programs like valgrind. With glibc's current definition these programs can be fooled into thinking that struct dirent accesses are invalid (outside of array bounds) when they are actually OK, so people shut off array-bounds checking. If we used flexible array members, valgrind etc. should know that the array's upper bound is unknown and should not issue so many false alarms, so people can leave bounds checking on.

Also, I expect this sort of thing will become more important as GCC -fbounds-check becomes more practical.

If flexible arrays are no-go for some reason, I suppose we could use 'char 'd_name[SIZE_MAX - 1000];' instead. That should get peoples' attention. :-)
diff --git a/bits/dirent.h b/bits/dirent.h
index 7b79a53..8546c29 100644
--- a/bits/dirent.h
+++ b/bits/dirent.h
@@ -32,7 +32,7 @@ struct dirent
     unsigned char d_namlen;	/* Length of the file name.  */
 
     /* Only this member is in the POSIX standard.  */
-    char d_name[1];		/* File name (actually longer).  */
+    char d_name __flexarr;	/* File name.  */
   };
 
 #ifdef __USE_LARGEFILE64
@@ -42,8 +42,7 @@ struct dirent64
     unsigned short int d_reclen;
     unsigned char d_type;
     unsigned char d_namlen;
-
-    char d_name[1];
+    char d_name __flexarr;	/* File name.  */
   };
 #endif
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]