On Wed, 3 Nov 2010, Enlightenment SVN wrote:
> Log: > * eina: fix possible race condition between opendir/readdir_r/pathconf. > > See http://womble.decadent.org.uk/readdir_r-advisory.html . > > Author: cedric > Date: 2010-11-03 03:19:55 -0700 (Wed, 03 Nov 2010) > New Revision: 54117 > > Modified: > trunk/eina/configure.ac trunk/eina/src/lib/eina_file.c > > Modified: trunk/eina/configure.ac > =================================================================== > --- trunk/eina/configure.ac 2010-11-03 08:24:56 UTC (rev 54116) > +++ trunk/eina/configure.ac 2010-11-03 10:19:55 UTC (rev 54117) > @@ -530,6 +530,7 @@ > fi > AC_CHECK_FUNCS([openat], [AC_DEFINE(HAVE_OPENAT)], []) > AC_CHECK_FUNCS([statat], [AC_DEFINE(HAVE_STATAT)], []) > +AC_CHECK_FUNCS([fpathconf], [AC_DEFINE(HAVE_FPATHCONF)], []) Add pathconf() too Vincent > > ### Modules > > > Modified: trunk/eina/src/lib/eina_file.c > =================================================================== > --- trunk/eina/src/lib/eina_file.c 2010-11-03 08:24:56 UTC (rev 54116) > +++ trunk/eina/src/lib/eina_file.c 2010-11-03 10:19:55 UTC (rev 54117) > @@ -81,6 +81,45 @@ > char dir[1]; > }; > > +/* > + * This complex piece of code is needed due to possible race condition. > + * The code and description of the issue can be found at : > + * http://womble.decadent.org.uk/readdir_r-advisory.html > + */ > +static size_t > +_eina_dirent_buffer_size(DIR * dirp) > +{ > + long name_max; > + size_t name_end; > + > +#if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) && defined(_PC_NAME_MAX) > + name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX); > + > + if (name_max == -1) > + { > +# if defined(NAME_MAX) > + name_max = (NAME_MAX > 255) ? NAME_MAX : 255; > +# else > + return PATH_MAX; > +# endif > + } > +#else > +# if defined(NAME_MAX) > + name_max = (NAME_MAX > 255) ? NAME_MAX : 255; > +# else > +# ifdef _PC_NAME_MAX > +# warning "buffer size for readdir_r cannot be determined safely, best > effort, but racy" > + name_max = pathconf(dirp, _PC_NAME_MAX); > +# else > +# error "buffer size for readdir_r cannot be determined safely" > +# endif > +# endif > +#endif > + name_end = (size_t) offsetof(struct dirent, d_name) + name_max + 1; > + > + return (name_end > sizeof (struct dirent) ? name_end : sizeof (struct > dirent)); > +} > + > static Eina_Bool > _eina_file_ls_iterator_next(Eina_File_Iterator *it, void **data) > { > @@ -88,7 +127,7 @@ > char *name; > size_t length; > > - dp = alloca(offsetof(struct dirent, d_name) + pathconf(it->dir, > _PC_NAME_MAX) + 1); > + dp = alloca(_eina_dirent_buffer_size(it->dirp)); > > do > { > @@ -150,7 +189,7 @@ > struct dirent *dp; > size_t length; > > - dp = alloca(offsetof(struct dirent, d_name) + pathconf(it->dir, > _PC_NAME_MAX) + 1); > + dp = alloca(_eina_dirent_buffer_size(it->dir)); > > do > { > @@ -336,8 +375,8 @@ > return EINA_FALSE; > > dlength = strlen(dir); > - de = alloca(offsetof(struct dirent, d_name) + pathconf(dir, _PC_NAME_MAX) > + 1); > - > + de = alloca(_eina_dirent_buffer_size(dir)); > + > while ((!readdir_r(d, de, &de) && de)) > { > if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) > > > ------------------------------------------------------------------------------ > Achieve Improved Network Security with IP and DNS Reputation. > Defend against bad network traffic, including botnets, malware, > phishing sites, and compromised hosts - saving your company time, > money, and embarrassment. Learn More! > http://p.sf.net/sfu/hpdev2dev-nov > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > ------------------------------------------------------------------------------ Achieve Improved Network Security with IP and DNS Reputation. Defend against bad network traffic, including botnets, malware, phishing sites, and compromised hosts - saving your company time, money, and embarrassment. Learn More! http://p.sf.net/sfu/hpdev2dev-nov _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
