Restrict usage on -e option (prevent array overflow with many -e and prevent excludin...

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index cd844ae52cf97db163fe3b0463772a0522ca2f7a..eac1f5baad11fdea07589273ef5b15d370c9742b 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.20 2000/03/02 13:52:52 stelian Exp $";
+       "$Id: main.c,v 1.25 2000/09/01 14:40:27 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -79,6 +79,7 @@ static const char rcsid[] =
 
 #include "dump.h"
 #include "pathnames.h"
+#include "bylabel.h"
 
 #ifndef SBOFF
 #define SBOFF (SBLOCK * DEV_BSIZE)
@@ -126,6 +127,7 @@ main(int argc, char *argv[])
 #endif
        time_t tnow;
        char labelstr[LBLSIZE];
+       char *diskparam;
 
        spcl.c_date = 0;
 #ifdef __linux__
@@ -200,8 +202,15 @@ main(int argc, char *argv[])
                        
                                        /* 04-Feb-00 ILC */
                case 'e':               /* exclude an inode */
-                       iexclude_list[iexclude_num++] = 
-                         numarg("inode to exclude",0L,0L);
+                       if (iexclude_num == IEXCLUDE_MAXNUM) {
+                               (void)fprintf(stderr, "Too many -e options\n");
+                               exit(X_STARTUP);
+                       }
+                       iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
+                       if (iexclude_list[iexclude_num-1] <= ROOTINO) {
+                               (void)fprintf(stderr, "Cannot exclude inode %d\n", iexclude_list[iexclude_num-1]);
+                               exit(X_STARTUP);
+                       }
                        msg("Added %d to exclude list\n",
                            iexclude_list[iexclude_num-1]);
                        break;
@@ -287,9 +296,9 @@ main(int argc, char *argv[])
                (void)fprintf(stderr, "Must specify disk or filesystem\n");
                exit(X_STARTUP);
        }
-       disk = *argv++;
-       if (strlen(disk) >= MAXPATHLEN) {
-               (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
+       diskparam = *argv++;
+       if (strlen(diskparam) >= MAXPATHLEN) {
+               (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", diskparam);
                exit(X_STARTUP);
        }
        argc--;
@@ -363,6 +372,14 @@ main(int argc, char *argv[])
                signal(SIGINT, SIG_IGN);
        set_operators();        /* /etc/group snarfed */
        getfstab();             /* /etc/fstab snarfed */
+
+       disk = get_device_name(diskparam);
+       if (!disk) {            /* null means the disk is some form
+                                  of LABEL= or UID= but it was not
+                                  found */
+               msg("Cannot find a disk having %s\n", diskparam);
+               exit(X_STARTUP);
+       }
        /*
         *      disk may end in / and this can confuse
         *      fstabsearch.
@@ -410,6 +427,17 @@ main(int argc, char *argv[])
                    NAMELEN);
        }
 #endif
+
+       if (directory[0] != 0) {
+               if (level != '0') {
+                       (void)fprintf(stderr, "Only level 0 dumps are allowed on a subdirectory\n");
+                       exit(X_STARTUP);
+               }
+               if (uflag) {
+                       (void)fprintf(stderr, "You can't update the dumpdates file when dumping a subdirectory\n");
+                       exit(X_STARTUP);
+               }
+       }
        spcl.c_dev[NAMELEN-1]='\0';
        spcl.c_filesys[NAMELEN-1]='\0';
        (void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1);
@@ -511,7 +539,7 @@ main(int argc, char *argv[])
        usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
        dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char));
        dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
-       tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
+       tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
 
        nonodump = spcl.c_level < honorlevel;
 
@@ -537,12 +565,12 @@ main(int argc, char *argv[])
        }
 
        if (sizest) {
-               printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+               printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
                exit(X_FINOK);
        } /* stop here for size estimate */
 
        if (pipeout || unlimited) {
-               tapesize += 10; /* 10 trailer blocks */
+               tapesize += 11; /* 10 trailer blocks + 1 map header */
                msg("estimated %ld tape blocks.\n", tapesize);
        } else {
                double fetapes;
@@ -664,10 +692,13 @@ main(int argc, char *argv[])
        tnow = trewind();
 
        if (pipeout)
-               msg("%ld tape blocks\n", spcl.c_tapea);
+               msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea,
+                       ((double)spcl.c_tapea * TP_BSIZE / 1048576));
        else
-               msg("%ld tape blocks on %d volumes(s)\n",
-                   spcl.c_tapea, spcl.c_volume);
+               msg("%ld tape blocks (%.2fMB) on %d volume(s)\n",
+                   spcl.c_tapea, 
+                   ((double)spcl.c_tapea * TP_BSIZE / 1048576),
+                   spcl.c_volume);
 
        /* report dump performance, avoid division through zero */
        if (tend_writing - tstart_writing == 0)