1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00

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>
This commit is contained in:
Daniel P. Berrangé 2019-04-02 13:35:43 +01:00
parent ebe9c6eab7
commit c1ac1e4637

View File

@ -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;