From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Oct 2023 20:44:50 +0000 (+0200)
Subject: image-discover: skip properly over files that cannot be recognized as image files
X-Git-Tag: v255-rc1~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7df707b8a1ef6bb1e25d8c6d04ec3022a6b2b17;p=thirdparty%2Fsystemd.git

image-discover: skip properly over files that cannot be recognized as image files

Follow-up for: #29364
---

diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c
index 50662037dee..e407820e181 100644
--- a/src/shared/discover-image.c
+++ b/src/shared/discover-image.c
@@ -629,13 +629,14 @@ int image_discover(
                                 r = extract_pretty(de->d_name, image_class_suffix_to_string(class), NULL, &pretty);
                         else if (S_ISBLK(st.st_mode))
                                 r = extract_pretty(de->d_name, NULL, NULL, &pretty);
-                        else
+                        else {
+                                log_debug("Skipping directory entry '%s', which is neither regular file, directory nor block device.", de->d_name);
                                 continue;
-                        if (r < 0)
-                                return r;
-
-                        if (!image_name_is_valid(pretty))
+                        }
+                        if (r < 0) {
+                                log_debug_errno(r, "Skipping directory entry '%s', which doesn't look like an image.", de->d_name);
                                 continue;
+                        }
 
                         if (hashmap_contains(h, pretty))
                                 continue;