From: Eric Blake <eblake@redhat.com>
Date: Fri, 18 Mar 2011 20:22:19 +0000 (-0600)
Subject: util: guarantee sane errno in virFileIsExecutable
X-Git-Tag: CVE-2011-1486~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8351358fb4f21aa480188c848ef9b13e7a4c4691;p=thirdparty%2Flibvirt.git

util: guarantee sane errno in virFileIsExecutable

If virFileIsExecutable is to replace access(file,X_OK), then
errno must be usable on failure.

* src/util/util.c (virFileIsExecutable): Set errno on failure.
---

diff --git a/src/util/util.c b/src/util/util.c
index 5b5dd5e208..1e4e2abb4b 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -1357,7 +1357,8 @@ bool virFileExists(const char *path)
     return access(path, F_OK) == 0;
 }
 
-/* Check that a file is regular and has executable bits.
+/* Check that a file is regular and has executable bits.  If false is
+ * returned, errno is valid.
  *
  * Note: In the presence of ACLs, this may return true for a file that
  * would actually fail with EACCES for a given user, or false for a
@@ -1370,9 +1371,12 @@ virFileIsExecutable(const char *file)
 
     /* We would also want to check faccessat if we cared about ACLs,
      * but we don't.  */
-    return (stat(file, &sb) == 0 &&
-            S_ISREG(sb.st_mode) &&
-            (sb.st_mode & 0111) != 0);
+    if (stat(file, &sb) < 0)
+        return false;
+    if (S_ISREG(sb.st_mode) && (sb.st_mode & 0111) != 0)
+        return true;
+    errno = S_ISDIR(sb.st_mode) ? EISDIR : EACCES;
+    return false;
 }
 
 #ifndef WIN32