File xen.b9daff9d811285f1e40669bc621c2241793f7a95.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.b9daff9d811285f1e40669bc621c2241793f7a95.patch of Package xen (Revision 9d5b99d6453170bd36557035946b2971)

Currently displaying revision 9d5b99d6453170bd36557035946b2971 , Show latest

From: Chris Patterson <pattersonc@ainfosec.com>
Date: Fri, 3 Jun 2016 12:50:09 -0400
Subject: b9daff9d811285f1e40669bc621c2241793f7a95

libxl: replace deprecated readdir_r() with readdir()

Replace the usage of readdir_r() with readdir() to address a
compilation error under glibc due to the deprecation of readdir_r
for their next release (2.24) [1, 2].

Remove code specific to usage of readdir_r which is no longer required,
such as zalloc_dirent().

From the GNU libc manual [3]:
"
 It is expected that future versions of POSIX will obsolete readdir_r and
 mandate the level of thread safety for readdir which is provided by the
 GNU C Library and other implementations today.
"

There is a filed bug in the Austin Group Defect Tracker [4]  in which 'dalias'
proposes (in comment 0001632) that:
"
   I would like to propose an alternate solution. For readdir, replace the text:
    "The readdir() function need not be thread-safe."
   with:
    "If multiple threads call the readdir() function with the same directory
    stream argument and without synchronization to preclude simultaneous
    access, then the behavior is undefined."

With this change, the clunky readdir_r function is no longer needed or
   useful, and should probably be deprecated. As the only reasonable way
   to meet the implementation requirements for readdir is to have the dirent
   buffer in the DIR structure, this change should not require any change to
   existing implementations.
"

[1] https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html
[2] https://sourceware.org/bugzilla/show_bug.cgi?id=19056
[3] https://www.gnu.org/software/libc/manual/html_node/Reading_002fClosing-Directory.html
[4] http://austingroupbugs.net/view.php?id=696

Signed-off-by: Chris Patterson <pattersonc@ainfosec.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxl/libxl_utils.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -462,32 +462,30 @@ int libxl__remove_directory(libxl__gc *gc, const char *dirpath)
     DIR *d = 0;
 
     d = opendir(dirpath);
     if (!d) {
         if (errno == ENOENT)
             goto out;
 
         LOGE(ERROR, "failed to opendir %s for removal", dirpath);
         rc = ERROR_FAIL;
         goto out;
     }
 
-    size_t need = offsetof(struct dirent, d_name) +
-        pathconf(dirpath, _PC_NAME_MAX) + 1;
-    struct dirent *de_buf = libxl__zalloc(gc, need);
     struct dirent *de;
 
     for (;;) {
-        int r = readdir_r(d, de_buf, &de);
-        if (r) {
+        errno = 0;
+        de = readdir(d);
+        if (!de && errno) {
             LOGE(ERROR, "failed to readdir %s for removal", dirpath);
             rc = ERROR_FAIL;
             break;
         }
         if (!de)
             break;
 
         if (!strcmp(de->d_name, ".") ||
             !strcmp(de->d_name, ".."))
             continue;
 
         const char *subpath = GCSPRINTF("%s/%s", dirpath, de->d_name);

Places

File xen.b9daff9d811285f1e40669bc621c2241793f7a95.patch of Package xen (Revision 9d5b99d6453170bd36557035946b2971)

Places