Add --enable-hardening which builds e2fsprogs with security hardening

[thirdparty/e2fsprogs.git] / resize / main.c

diff --git a/resize/main.c b/resize/main.c
index c25de61947f324c7e694d6844706b9b11c891bbd..f25df40596f21dc97245e6886328af9e2833a047 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -12,8 +12,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #ifdef HAVE_GETOPT_H
@@ -29,6 +33,7 @@ extern int optind;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <libgen.h>
 
 #include "e2p/e2p.h"
 
@@ -42,7 +47,8 @@ static char *device_name, *io_options;
 static void usage (char *prog)
 {
        fprintf (stderr, _("Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] "
-                          "[-p] device [-b|-s|new_size]\n\n"), prog);
+                          "[-p] device [-b|-s|new_size] [-z undo_file]\n\n"),
+                prog);
 
        exit (1);
 }
@@ -152,8 +158,7 @@ static void determine_fs_stride(ext2_filsys fs)
 
 static void bigalloc_check(ext2_filsys fs, int force)
 {
-       if (!force && EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-                               EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
+       if (!force && ext2fs_has_feature_bigalloc(fs->super)) {
                fprintf(stderr, "%s", _("\nResizing bigalloc file systems has "
                                        "not been fully tested.  Proceed at\n"
                                        "your own risk!  Use the force option "
@@ -162,6 +167,81 @@ static void bigalloc_check(ext2_filsys fs, int force)
        }
 }
 
+static int resize2fs_setup_tdb(const char *device_name, char *undo_file,
+                              io_manager *io_ptr)
+{
+       errcode_t retval = ENOMEM;
+       char *tdb_dir = NULL, *tdb_file = NULL;
+       char *dev_name, *tmp_name;
+
+       /* (re)open a specific undo file */
+       if (undo_file && undo_file[0] != 0) {
+               retval = set_undo_io_backing_manager(*io_ptr);
+               if (retval)
+                       goto err;
+               *io_ptr = undo_io_manager;
+               retval = set_undo_io_backup_file(undo_file);
+               if (retval)
+                       goto err;
+               printf(_("Overwriting existing filesystem; this can be undone "
+                        "using the command:\n"
+                        "    e2undo %s %s\n\n"),
+                       undo_file, device_name);
+               return retval;
+       }
+
+       /*
+        * Configuration via a conf file would be
+        * nice
+        */
+       tdb_dir = getenv("E2FSPROGS_UNDO_DIR");
+       if (!tdb_dir)
+               tdb_dir = "/var/lib/e2fsprogs";
+
+       if (!strcmp(tdb_dir, "none") || (tdb_dir[0] == 0) ||
+           access(tdb_dir, W_OK))
+               return 0;
+
+       tmp_name = strdup(device_name);
+       if (!tmp_name)
+               goto errout;
+       dev_name = basename(tmp_name);
+       tdb_file = malloc(strlen(tdb_dir) + 11 + strlen(dev_name) + 7 + 1);
+       if (!tdb_file) {
+               free(tmp_name);
+               goto errout;
+       }
+       sprintf(tdb_file, "%s/resize2fs-%s.e2undo", tdb_dir, dev_name);
+       free(tmp_name);
+
+       if ((unlink(tdb_file) < 0) && (errno != ENOENT)) {
+               retval = errno;
+               com_err(program_name, retval,
+                       _("while trying to delete %s"), tdb_file);
+               goto errout;
+       }
+
+       retval = set_undo_io_backing_manager(*io_ptr);
+       if (retval)
+               goto errout;
+       *io_ptr = undo_io_manager;
+       retval = set_undo_io_backup_file(tdb_file);
+       if (retval)
+               goto errout;
+       printf(_("Overwriting existing filesystem; this can be undone "
+                "using the command:\n"
+                "    e2undo %s %s\n\n"), tdb_file, device_name);
+
+       free(tdb_file);
+       return 0;
+errout:
+       free(tdb_file);
+err:
+       com_err(program_name, retval, "%s",
+               _("while trying to setup undo file\n"));
+       return retval;
+}
+
 int main (int argc, char ** argv)
 {
        errcode_t       retval;
@@ -186,7 +266,7 @@ int main (int argc, char ** argv)
        unsigned int    blocksize;
        long            sysval;
        int             len, mount_flags;
-       char            *mtpt;
+       char            *mtpt, *undo_file = NULL;
 
 #ifdef ENABLE_NLS
        setlocale(LC_MESSAGES, "");
@@ -203,7 +283,7 @@ int main (int argc, char ** argv)
        if (argc && *argv)
                program_name = *argv;
 
-       while ((c = getopt(argc, argv, "d:fFhMPpS:bs")) != EOF) {
+       while ((c = getopt(argc, argv, "d:fFhMPpS:bsz:")) != EOF) {
                switch (c) {
                case 'h':
                        usage(program_name);
@@ -235,6 +315,9 @@ int main (int argc, char ** argv)
                case 's':
                        flags |= RESIZE_DISABLE_64BIT;
                        break;
+               case 'z':
+                       undo_file = optarg;
+                       break;
                default:
                        usage(program_name);
                }
@@ -318,7 +401,11 @@ int main (int argc, char ** argv)
                io_flags = EXT2_FLAG_RW | EXT2_FLAG_EXCLUSIVE;
 
        io_flags |= EXT2_FLAG_64BITS;
-
+       if (undo_file) {
+               retval = resize2fs_setup_tdb(device_name, undo_file, &io_ptr);
+               if (retval)
+                       exit(1);
+       }
        retval = ext2fs_open2(device_name, io_options, io_flags,
                              0, 0, io_ptr, &fs);
        if (retval) {
@@ -423,8 +510,7 @@ int main (int argc, char ** argv)
        if (flags & (RESIZE_DISABLE_64BIT | RESIZE_ENABLE_64BIT)) {
                new_size = ext2fs_blocks_count(fs->super);
        }
-       if (!EXT2_HAS_INCOMPAT_FEATURE(fs->super,
-                                      EXT4_FEATURE_INCOMPAT_64BIT)) {
+       if (!ext2fs_has_feature_64bit(fs->super)) {
                /* Take 16T down to 2^32-1 blocks */
                if (new_size == (1ULL << 32))
                        new_size--;
@@ -490,8 +576,7 @@ int main (int argc, char ** argv)
                        exit(1);
                }
                if (flags & RESIZE_ENABLE_64BIT &&
-                   !EXT2_HAS_INCOMPAT_FEATURE(fs->super,
-                               EXT3_FEATURE_INCOMPAT_EXTENTS)) {
+                   !ext2fs_has_feature_extents(fs->super)) {
                        fprintf(stderr, _("Please enable the extents feature "
                                "with tune2fs before enabling the 64bit "
                                "feature.\n"));
@@ -504,12 +589,12 @@ int main (int argc, char ** argv)
                exit(0);
        }
        if ((flags & RESIZE_ENABLE_64BIT) &&
-           EXT2_HAS_INCOMPAT_FEATURE(fs->super, EXT4_FEATURE_INCOMPAT_64BIT)) {
+           ext2fs_has_feature_64bit(fs->super)) {
                fprintf(stderr, _("The filesystem is already 64-bit.\n"));
                exit(0);
        }
        if ((flags & RESIZE_DISABLE_64BIT) &&
-           !EXT2_HAS_INCOMPAT_FEATURE(fs->super, EXT4_FEATURE_INCOMPAT_64BIT)) {
+           !ext2fs_has_feature_64bit(fs->super)) {
                fprintf(stderr, _("The filesystem is already 32-bit.\n"));
                exit(0);
        }