Changeset 1998 in MondoRescue

Timestamp:

Jul 10, 2008, 5:48:47 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Improves again the security of the rm used

Location:

branches/2.2.7/mindi

Files:

• mindi (modified) (8 diffs)
• rootfs/sbin/install-additional-tools (modified) (2 diffs)

branches/2.2.7/mindi/mindi

@@ -1621 +1621 @@
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
 Sorry, your kernel is too big for your image.\n" >> $LOGFILE
-        rm -f $mountpoint/vmlinuz
+        [ "$mountpoint" != "" ] && rm -f $mountpoint/vmlinuz
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
     #   losetup /dev/loop0 -d
-        rm -f $imagefile
+        [ "$imagefile" != "" ] && rm -f $imagefile
         return 0
     fi
@@ -1634 +1634 @@
     echo "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" >> $LOGFILE
     # make it bootable
-    rm -f $mountpoint/zero
+    [ "$mountpoint" != "" ] && rm -f $mountpoint/zero
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
     if [ "$KERN_DISK_MADE" ] ; then
@@ -1653 +1653 @@
         echo -en "...failed\n"
         LogIt $BOOT_SIZE"KB boot disk was NOT created\n"
-        rm -f $imagefile
+        [ "$imagefile" != "" ] && rm -f $imagefile
     fi
     [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
@@ -1712 +1712 @@
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
 Sorry, your kernel is too big for your image.\n" >> $LOGFILE
-        rm -f $mountpoint/vmlinuz
+        [ "$mountpoint" != "" ] && rm -f $mountpoint/vmlinuz
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
 
-        rm -f $imagefile
+        [ "$imagefile" != "" ] && rm -f $imagefile
         return 0
     fi
@@ -1726 +1726 @@
 
     # make it bootable
-    rm -f $mountpoint/zero
+    [ "$mountpoint" != "" ] && rm -f $mountpoint/zero
     mkdir -p $mountpoint/etc
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
@@ -1736 +1736 @@
         echo -en "...$DONE\n"
         if [ "$KERN_DISK_MADE" ] ; then
-            rm -f $imagefile
+            [ "$imagefile" != "" ] && rm -f $imagefile
             LogIt "$BOOT_SIZE KB boot disks were created OK\n"
         fi
@@ -1742 +1742 @@
         echo -en "...failed\n"
         LogIt $BOOT_SIZE"KB boot disk was NOT created\n"
-        rm -f $imagefile
+        [ "$imagefile" != "" ] && rm -f $imagefile
     fi
     [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
@@ -2162 +2162 @@
                 if [ "`echo $i | cut -c1`" = "/" ]; then
                     j=`echo $i | cut -c2-`
-                    rm -f $j
+                    [ "$j" != "" ] && rm -f $j
                 fi
             done

branches/2.2.7/mindi/rootfs/sbin/install-additional-tools

@@ -22 +22 @@
 if [ ! "$GROOVY" ] ; then
     LogIt "I'm not groovy!"
+    exit 1
+fi
+
+if [ $mountdir = "/" ]; then
+    LogIt "mountdir shouldn't be /"
     exit 1
 fi
@@ -82 +87 @@
 LogIt "Exiting install-additional-tools"
 exit 0
-
-# exit $res
-