From 305393135b90c3650faaa518cdc8a35d9fbf839d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 16 Jul 2026 19:20:57 +0100 Subject: [PATCH] rm-rf: use faccessat instead of fstatat Follow-up for 9dd2dab37e91ab4b000802d98aa7c4713836d53a --- src/shared/rm-rf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c index 56a56ed9ab..203e075b9a 100644 --- a/src/shared/rm-rf.c +++ b/src/shared/rm-rf.c @@ -444,14 +444,8 @@ int rm_rf_at(int dir_fd, const char *path, RemoveFlags flags) { /* We refuse to clean the root file system with this call. This is extra paranoia to never cause a * really seriously broken system. */ r = path_is_root_at(dir_fd, path); - if (r == -ENOENT) { - struct stat st; - - if (fstatat(dir_fd, path, &st, AT_SYMLINK_NOFOLLOW) < 0) - r = -errno; - else - r = 0; /* The entry exists, but is most likely a dangling symlink. */ - } + if (r == -ENOENT) + r = RET_NERRNO(faccessat(dir_fd, path, F_OK, AT_SYMLINK_NOFOLLOW)); if (FLAGS_SET(flags, REMOVE_MISSING_OK) && r == -ENOENT) return 0; if (r < 0)