From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 3 Sep 2024 08:52:16 +0000 (+0200)
Subject: resolved: use unlinkat() where appropriate
X-Git-Tag: v257-rc1~476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=368051ee6b6c75b9bccec8df021f1d98953f46be;p=thirdparty%2Fsystemd.git

resolved: use unlinkat() where appropriate
---

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index c842bf69c5e..5f92684215c 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -1726,7 +1726,6 @@ void manager_cleanup_saved_user(Manager *m) {
         }
 
         FOREACH_DIRENT_ALL(de, d, log_error_errno(errno, "Failed to read interface directory: %m")) {
-                _cleanup_free_ char *p = NULL;
                 int ifindex;
                 Link *l;
 
@@ -1750,13 +1749,8 @@ void manager_cleanup_saved_user(Manager *m) {
                 continue;
 
         rm:
-                p = path_join("/run/systemd/resolve/netif", de->d_name);
-                if (!p) {
-                        log_oom();
-                        return;
-                }
-
-                (void) unlink(p);
+                if (unlinkat(dirfd(d), de->d_name, 0) < 0)
+                        log_warning_errno(errno, "Failed to remove left-over interface configuration file '%s', ignoring: %m", de->d_name);
         }
 }