[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] Ignores EOPNOTSUPP when attempting to access an image on an NFS share.



rhbz#517157

Signed-off-by: Darryl L. Pierce <dpierce redhat com>
---
 src/security_selinux.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/security_selinux.c b/src/security_selinux.c
index 0db9f49..f1e3f17 100644
--- a/src/security_selinux.c
+++ b/src/security_selinux.c
@@ -323,6 +323,8 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
     VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
 
     if (setfilecon(path, tcon) < 0) {
+        int setfilecon_errno = errno;
+
         if (getfilecon(path, &econ) >= 0) {
             if (STREQ(tcon, econ)) {
                 freecon(econ);
@@ -331,14 +333,21 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
             }
             freecon(econ);
         }
-        virSecurityReportError(conn, VIR_ERR_ERROR,
-                               _("%s: unable to set security context "
-                                 "'\%s\' on %s: %s."), __func__,
-                               tcon,
-                               path,
-                               virStrerror(errno, ebuf, sizeof ebuf));
-        if (security_getenforce() == 1)
+
+	/* if the error complaint is related to an image hosted on
+	 * an nfs mount, then ignore it.
+	 * rhbz 517157
+	 */
+	if (setfilecon_errno != EOPNOTSUPP) {
+	  virSecurityReportError(conn, VIR_ERR_ERROR,
+				 _("%s: unable to set security context "
+				   "'\%s\' on %s: %s."), __func__,
+				 tcon,
+				 path,
+				 virStrerror(errno, ebuf, sizeof ebuf));
+	  if (security_getenforce() == 1)
             return -1;
+	}
     }
     return 0;
 }
-- 
1.6.2.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]