Prep v234: Apply missing upstream fixes in src/basic (1/6)

[elogind.git] / src / basic / rm-rf.c

diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 6912b23f5fc89430389ca6a96c1b5c2c1a479ef5..156366c7d1487f419697d7ae3808829ccfd1b578 100644 (file)
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <dirent.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>


@@ -27,6 +26,8 @@
 #include <unistd.h>
 
 //#include "btrfs-util.h"
 #include <unistd.h>
 
 //#include "btrfs-util.h"

+#include "cgroup-util.h"
+#include "dirent-util.h"

 #include "fd-util.h"
 #include "log.h"
 #include "macro.h"
 #include "fd-util.h"
 #include "log.h"
 #include "macro.h"


@@ -36,9 +37,15 @@
 #include "stat-util.h"
 #include "string-util.h"
 
 #include "stat-util.h"
 #include "string-util.h"
 

+static bool is_physical_fs(const struct statfs *sfs) {
+        return !is_temporary_fs(sfs) && !is_cgroup_fs(sfs);
+}
+

 int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
         _cleanup_closedir_ DIR *d = NULL;
 int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
         _cleanup_closedir_ DIR *d = NULL;

+        struct dirent *de;

         int ret = 0, r;
         int ret = 0, r;

+        struct statfs sfs;

 
         assert(fd >= 0);
 
 
         assert(fd >= 0);
 


@@ -47,13 +54,13 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
 
         if (!(flags & REMOVE_PHYSICAL)) {
 
 
         if (!(flags & REMOVE_PHYSICAL)) {
 

-                r = fd_is_temporary_fs(fd);
+                r = fstatfs(fd, &sfs);

                 if (r < 0) {
                         safe_close(fd);
                 if (r < 0) {
                         safe_close(fd);

-                        return r;
+                        return -errno;

                 }
 
                 }
 

-                if (!r) {
+                if (is_physical_fs(&sfs)) {

                         /* We refuse to clean physical file systems
                          * with this call, unless explicitly
                          * requested. This is extra paranoia just to
                         /* We refuse to clean physical file systems
                          * with this call, unless explicitly
                          * requested. This is extra paranoia just to


@@ -72,20 +79,11 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
                 return errno == ENOENT ? 0 : -errno;
         }
 
                 return errno == ENOENT ? 0 : -errno;
         }
 

-        for (;;) {
-                struct dirent *de;
+        FOREACH_DIRENT_ALL(de, d, return -errno) {

                 bool is_dir;
                 struct stat st;
 
                 bool is_dir;
                 struct stat st;
 

-                errno = 0;
-                de = readdir(d);
-                if (!de) {
-                        if (errno > 0 && ret == 0)
-                                ret = -errno;
-                        return ret;
-                }
-
-                if (streq(de->d_name, ".") || streq(de->d_name, ".."))
+                if (dot_or_dot_dot(de->d_name))

                         continue;
 
                 if (de->d_type == DT_UNKNOWN ||
                         continue;
 
                 if (de->d_type == DT_UNKNOWN ||


@@ -128,7 +126,7 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
                                 continue;
                         }
 
                                 continue;
                         }
 

-#if 0
+#if 0 /// elogind does not support BTRFS this directly

                         if ((flags & REMOVE_SUBVOLUME) && st.st_ino == 256) {
 
                                 /* This could be a subvolume, try to remove it */
                         if ((flags & REMOVE_SUBVOLUME) && st.st_ino == 256) {
 
                                 /* This could be a subvolume, try to remove it */


@@ -174,6 +172,7 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
                         }
                 }
         }
                         }
                 }
         }

+        return ret;

 }
 
 int rm_rf(const char *path, RemoveFlags flags) {
 }
 
 int rm_rf(const char *path, RemoveFlags flags) {


@@ -185,12 +184,12 @@ int rm_rf(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. */
         /* We refuse to clean the root file system with this
          * call. This is extra paranoia to never cause a really
          * seriously broken system. */

-        if (path_equal(path, "/")) {
+        if (path_equal_or_files_same(path, "/", AT_SYMLINK_NOFOLLOW)) {

                 log_error("Attempted to remove entire root file system, and we can't allow that.");
                 return -EPERM;
         }
 
                 log_error("Attempted to remove entire root file system, and we can't allow that.");
                 return -EPERM;
         }
 

-#if 0
+#if 0 /// elogind does not support BTRFS this directly

         if ((flags & (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) == (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) {
                 /* Try to remove as subvolume first */
                 r = btrfs_subvol_remove(path, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA);
         if ((flags & (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) == (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) {
                 /* Try to remove as subvolume first */
                 r = btrfs_subvol_remove(path, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA);


@@ -214,7 +213,7 @@ int rm_rf(const char *path, RemoveFlags flags) {
                         if (statfs(path, &s) < 0)
                                 return -errno;
 
                         if (statfs(path, &s) < 0)
                                 return -errno;
 

-                        if (!is_temporary_fs(&s)) {
+                        if (is_physical_fs(&s)) {

                                 log_error("Attempted to remove disk file system, and we can't allow that.");
                                 return -EPERM;
                         }
                                 log_error("Attempted to remove disk file system, and we can't allow that.");
                                 return -EPERM;
                         }