Changeset 1644 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-devices.c

Timestamp:

Sep 23, 2007, 2:41:29 AM (17 years ago)

Author:

Bruno Cornec

Message:

Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp
or MINDI_CACHE when appropriate. Fix security issues in mondo
Thanks al ot Andree for catching all those issues.
Will not compile needs more work as bkpinfo->tmpdir isn't available everywhere
Should become a global in 3.x when only containing pointers.

File:

• branches/2.2.5/mondo/src/common/libmondo-devices.c (modified) (4 diffs)

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -855 +855 @@
     }
 
-    sprintf(mountpoint, "/tmp/cd.%d", (int) (random() % 32767));
+    sprintf(mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
     make_hole_for_dir(mountpoint);
 
@@ -1732 +1732 @@
             run_program_and_log_output("umount " MNT_CDROM, 5);
         }
-        system("mkdir -p /tmp/isodir &> /dev/null");
+        sprintf(tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
+        system(tmp);
         sprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                 cd_number_i_want);
         if (!does_file_exist(tmp)) {
-            sprintf(tmp, "/tmp/isodir/%s/%s-%d.iso",
+            sprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir,
                     bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                     cd_number_i_want);
             if (does_file_exist(tmp)) {
                 log_msg(1,
-                        "FIXME - hacking bkpinfo->isodir from '%s' to /tmp/isodir",
-                        bkpinfo->isodir);
-                strcpy(bkpinfo->isodir, "/tmp/isodir");
+                        "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir",
+                        bkpinfo->isodir, bkpinfo->tmpdir);
+                sprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
             }
         }
@@ -2117 +2118 @@
         }
         if (bkpinfo->disaster_recovery) {
-            system("umount /tmp/isodir 2> /dev/null");
+            sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            system(command);
             if (!popup_and_get_string
                 ("NFS share", "Which remote NFS share should I mount?",
@@ -2126 +2128 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d",
-                    (int) (random() % 32768));
+            sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);