From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 2 Apr 2019 12:35:43 +0000 (+0100)
Subject: security: avoid use of dirent d_type field
X-Git-Tag: v5.3.0-rc1~290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1ac1e463751f88f5c5c58c0bccc79df8bfe5570;p=thirdparty%2Flibvirt.git

security: avoid use of dirent d_type field

The d_type field cannot be assumed to be filled. Some filesystems, such
as older XFS, will simply report DT_UNKNOWN.

Even if the d_type is filled in, the use of it in the SELinux functions
is dubious. If labelling all files in a directory there's no reason to
skip things which are not regular files. We merely need to skip "." and
"..", which is done by virDirRead() already.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 2fceb547b4..094272e084 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -3282,9 +3282,6 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr mgr,
         return -1;
 
     while ((ret = virDirRead(dir, &ent, path)) > 0) {
-        if (ent->d_type != DT_REG)
-            continue;
-
         if (virAsprintf(&filename, "%s/%s", path, ent->d_name) < 0) {
             ret = -1;
             break;
@@ -3334,9 +3331,6 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManagerPtr mgr,
         return -1;
 
     while ((ret = virDirRead(dir, &ent, path)) > 0) {
-        if (ent->d_type != DT_REG)
-            continue;
-
         if (virAsprintf(&filename, "%s/%s", path, ent->d_name) < 0) {
             ret = -1;
             break;