Patch from Vladimir:

    1) fixed a bug that could crash df, mount, and umount applets if the root
    device name was longer then the word "root" (/dev/loop1 vs /dev/root) -
    2) severl functions needed static declaration in the umount applet
    3) update declaration for function in last_char_is() in libbb

1 files changed, 5 insertions, 1 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 0295fabc6..4e0e3e428 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -319,10 +319,14 @@ void show_mounts()
                 while ((m = getmntent(mountTable)) != 0) {
                         char *blockDevice = m->mnt_fsname;
                         if (strcmp(blockDevice, "/dev/root") == 0) {
-                                find_real_root_device_name( blockDevice);
+                                blockDevice = find_real_root_device_name(blockDevice);
                         }
                         printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
                                    m->mnt_type, m->mnt_opts);
+#ifdef BB_FEATURE_CLEAN_UP
+                        if(blockDevice != m->mnt_fsname)
+                                free(blockDevice);
+#endif
                 }
                 endmntent(mountTable);
         } else {