Handle d_type == DT_UNKNOWN correctly

As documented in the man-page, readdir() may return a directory entry with
d_type == DT_UNKNOWN. This must be handled for regular filesystems.

dirent_ensure_type() is available to set d_type if necessary. Use it in
some more places.

Without this systemd will fail to boot correctly with nfsroot and some
other filesystems.

Closes #13609

(cherry picked from commit 28e68bb23547cbc11cd3f62a1a38dbe2b387b370)
(cherry picked from commit 5c0224c7bf3c4b0f18d44ee9da7e058833b1d8e2)

Gbp-Pq: Name Handle-d_type-DT_UNKNOWN-correctly.patch

diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index b95e6239d4b217c1302f02c611505fc419a88ab7..e2d4c0d6e1726ab3d6f73b0d2f576e98e3d0c8ca 100644 (file)
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -84,6 +84,7 @@ static int write_access2_rules(const char *srcdir) {
         FOREACH_DIRENT(entry, dir, return 0) {
                 _cleanup_fclose_ FILE *policy = NULL;
 
+                dirent_ensure_type(dir, entry);
                 if (!dirent_is_file(entry))
                         continue;
 
@@ -150,6 +151,7 @@ static int write_cipso2_rules(const char *srcdir) {
         FOREACH_DIRENT(entry, dir, return 0) {
                 _cleanup_fclose_ FILE *policy = NULL;
 
+                dirent_ensure_type(dir, entry);
                 if (!dirent_is_file(entry))
                         continue;
 

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 30b9a66334fa7914e4f6984da46c49dd678e12aa..679eb6a62ec0c2068f91aabb9681e46cfb755306 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1378,6 +1378,7 @@ static int flush_devices(Manager *m) {
                 struct dirent *de;
 
                 FOREACH_DIRENT_ALL(de, d, break) {
+                        dirent_ensure_type(d, de);
                         if (!dirent_is_file(de))
                                 continue;
 

diff --git a/src/login/logind.c b/src/login/logind.c
index 3a16e6c8712a89740a1ae1e173e74f39d8180975..d889d7b9bec953851354a57a7f89810868261843 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -291,6 +291,7 @@ static int manager_enumerate_linger_users(Manager *m) {
         FOREACH_DIRENT(de, d, return -errno) {
                 int k;
 
+                dirent_ensure_type(d, de);
                 if (!dirent_is_file(de))
                         continue;
 

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index aa3b7731a34e9b62f237f2b2dfc9af76a9530db2..ef9d9723dcd09876ff4b7c0dc82af8e0f42f58b4 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -475,6 +475,7 @@ static int boot_entries_find_unified(
                 _cleanup_free_ char *j = NULL, *osrelease = NULL, *cmdline = NULL;
                 _cleanup_close_ int fd = -1;
 
+                dirent_ensure_type(d, de);
                 if (!dirent_is_file(de))
                         continue;
 

diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index 4a5f23e6c1bcbb0e76ffe9a508d661022fc98189..c7a6d6717244d63994e917db09a36442bff83ccd 100644 (file)
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -279,6 +279,7 @@ int unit_file_build_name_map(
                         if (hashmap_contains(ids, de->d_name))
                                 continue;
 
+                        dirent_ensure_type(d, de);
                         if (de->d_type == DT_LNK) {
                                 /* We don't explicitly check for alias loops here. unit_ids_map_get() which
                                  * limits the number of hops should be used to access the map. */