The closeall function is broken in such a way that it almost never

closes any file descriptors. It's calling strtol on the text
representation of the file descriptor, and then checking to see if the
value of *endptr is not '\0' before trying to close the file. This check
is wrong.

When strtol returns an endptr that points to a NULL byte, that indicates
that the conversion was completely successful. I believe this check
should instead be requiring that endptr is pointing to '\0' before
closing the fd.

Also, fix up the function to check for conversion errors from strtol. If
one occurs, just skip the close on that entry.

Finally, as Trond pointed out, it's unlikely that readdir will return a
blank string in d_name but that situation wouldn't be detected by the
current code. This patch adds such a check and skips the close if it
occurs.

Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/nfs/closeall.c b/support/nfs/closeall.c
index cc7fb3bd86164cf775eb71b1951bf3b064f1ef51..38fb162c3a3ccb89d7336cc264df18f094311bbb 100644 (file)
--- a/support/nfs/closeall.c
+++ b/support/nfs/closeall.c
@@ -7,19 +7,24 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <dirent.h>

+#include <errno.h>

 
 void
 closeall(int min)
 {
 
 void
 closeall(int min)
 {

+       char *endp;
+       long n;

        DIR *dir = opendir("/proc/self/fd");
        DIR *dir = opendir("/proc/self/fd");

+

        if (dir != NULL) {
                int dfd = dirfd(dir);
                struct dirent *d;
 
                while ((d = readdir(dir)) != NULL) {
        if (dir != NULL) {
                int dfd = dirfd(dir);
                struct dirent *d;
 
                while ((d = readdir(dir)) != NULL) {

-                       char *endp;
-                       long n = strtol(d->d_name, &endp, 10);
-                       if (*endp != '\0' && n >= min && n != dfd)
+                       errno = 0;
+                       n = strtol(d->d_name, &endp, 10);
+                       if (!errno && *endp == '\0' && endp != d->d_name &&
+                           n >= min && n != dfd)

                                (void) close(n);
                }
                closedir(dir);
                                (void) close(n);
                }
                closedir(dir);