Changeset 1644 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-fork.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-fork.c (modified) (7 diffs)

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

@@ -339 +339 @@
         log_if_failure = TRUE;
     }
-    sprintf(callstr,
-            "%s > /tmp/mondo-run-prog-thing.tmp 2> /tmp/mondo-run-prog-thing.err",
-            program);
+    sprintf(callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
+             program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
         *p = ' ';
@@ -368 +367 @@
                 "--------------------------------start of output-----------------------------");
     }
-    if (log_if_failure
-        &&
-        system
-        ("cat /tmp/mondo-run-prog-thing.err >> /tmp/mondo-run-prog-thing.tmp 2> /dev/null"))
-    {
+    sprintf(callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
     }
-    unlink("/tmp/mondo-run-prog-thing.err");
-    fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
+    sprintf(tmp, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    unlink(tmp);
+    sprintf(tmp, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    fin = fopen(tmp, "r");
     if (fin) {
         for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
@@ -397 +395 @@
         paranoid_fclose(fin);
     }
-    unlink("/tmp/mondo-run-prog-thing.tmp");
+    unlink(tmp);
     if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
         log_msg(0,
@@ -441 +439 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    sprintf(lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
-    mkstemp(lockfile);
+    sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
     sprintf(command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
@@ -514 +512 @@
     char *tmp;
     char *buf;
+    char filestr[MAX_STR_LEN];
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
@@ -614 +613 @@
             log_msg(5, "tmpB is %s", tmp);
             if (!strstr(tmp, PIMP_END_SZ)) {
-                ftmp = fopen("/tmp/out.leftover", "w");
+                sprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
+                ftmp = fopen(filestr, "w");
                 bytes_read_in = fread(tmp, 1, 64, fin);
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
@@ -693 +693 @@
 
     strcpy(title, tt);
-    strcpy(tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mondo.XXXXXXXX"));
+    sprintf(tempfile, "%s/mondo.binperc", bkpinfo->tmpdir);
     sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);