From aaf767a6cc20f3f48c161b71cfdf297c1bc97e72 Mon Sep 17 00:00:00 2001 From: lixiaokeng <63774002+lixiaokeng@users.noreply.github.com> Date: Mon, 6 Sep 2021 20:37:45 +0800 Subject: [PATCH] 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 --- util/mount.fuse.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/mount.fuse.c b/util/mount.fuse.c index f7e60c7..a6e5629 100644 --- 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; } -- 2.30.2