Fix: fd and memory leak in mount.fuse.c (#614)

The command isn't freed and the fuse_fd isn't
closed if execl failed. Fix it.

Signed-off-by: Lixiaokeng <lixiaokeng@huawei.com>

diff --git a/util/mount.fuse.c b/util/mount.fuse.c
index f7e60c75bb191e3e76c73717b150be82a51133a9..a6e5629dd3521120c91d381df4b51614d0742d87 100644 (file)
--- a/util/mount.fuse.c
+++ b/util/mount.fuse.c
@@ -243,6 +243,7 @@ int main(int argc, char *argv[])
        int dev = 1;
        int suid = 1;
        int pass_fuse_fd = 0;
+       int fuse_fd = 0;
        int drop_privileges = 0;
        char *dev_fd_mountpoint = NULL;
 
@@ -413,7 +414,7 @@ int main(int argc, char *argv[])
        }
 
        if (pass_fuse_fd)  {
-               int fuse_fd = prepare_fuse_fd(mountpoint, type, options);
+               fuse_fd = prepare_fuse_fd(mountpoint, type, options);
                dev_fd_mountpoint = xrealloc(NULL, 20);
                snprintf(dev_fd_mountpoint, 20, "/dev/fd/%u", fuse_fd);
                mountpoint = dev_fd_mountpoint;
@@ -441,5 +442,9 @@ int main(int argc, char *argv[])
        execl("/bin/sh", "/bin/sh", "-c", command, NULL);
        fprintf(stderr, "%s: failed to execute /bin/sh: %s\n", progname,
                strerror(errno));
+       
+       if (pass_fuse_fd)
+               close(fuse_fd);
+       free(command);
        return 1;
 }