From: John Ferlan <jferlan@redhat.com>
Date: Mon, 24 Aug 2015 16:37:41 +0000 (-0400)
Subject: virfile: Add error for root squash change mode failure
X-Git-Tag: CVE-2015-5247-1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fafc1bc1cd5c18f36089ec697da08f72270b35c;p=thirdparty%2Flibvirt.git

virfile: Add error for root squash change mode failure

This will only be seen when debugging, but in order to help determine
whether a virFileOpenForceOwnerMode failed during an NFS root-squash
volume/file creation, add an error message from the child.
---

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 5f64186bbe..3abef05036 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2113,8 +2113,13 @@ virFileOpenForked(const char *path, int openflags, mode_t mode,
 
         /* File is successfully open. Set permissions if requested. */
         ret = virFileOpenForceOwnerMode(path, fd, mode, uid, gid, flags);
-        if (ret < 0)
+        if (ret < 0) {
+            ret = -errno;
+            virReportSystemError(errno,
+                                 _("child process failed to force owner mode file '%s'"),
+                                 path);
             goto childerror;
+        }
 
         do {
             ret = sendfd(pair[1], fd);