mount.cifs.c: fix memory leaks in main func

In mount.cifs module, orgoptions and mountpoint in the main func
point to the memory allocated by func realpath and strndup respectively.
However, they are not freed before the main func returns so that the
memory leaks occurred.

The memory leak problem is reported by LeakSanitizer tool.
LeakSanitizer url: "https://github.com/google/sanitizers"

Here I free the pointers orgoptions and mountpoint before main
func returns.

Fixes：7549ad5e7126 ("memory leaks: caused by func realpath and strndup")
Signed-off-by: Jiawen Liu <liujiawen10@huawei.com>
Reported-by: Jin Du <dujin1@huawei.com>
Reviewed-by: Saisai Zhang <zhangsaisai@huawei.com>
Reviewed-by: Aurélien Aptel <aaptel@suse.com>

diff --git a/mount.cifs.c b/mount.cifs.c
index b3235e46da42a12decbde7b23849cc48773e313e..7748d54aa8144396d9cf68da4a01471a2fcc014d 100644 (file)
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -1942,6 +1942,9 @@ restore_privs:
                gid_t __attribute__((unused)) gignore = setfsgid(oldfsgid);
        }
 
+       if (rc) {
+               free(*mountpointp);
+       }
        return rc;
 }
 
@@ -2044,8 +2047,10 @@ int main(int argc, char **argv)
 
        /* chdir into mountpoint as soon as possible */
        rc = acquire_mountpoint(&mountpoint);
-       if (rc)
+       if (rc) {
+               free(orgoptions);
                return rc;
+       }
 
        /*
         * mount.cifs does privilege separation. Most of the code to handle
@@ -2064,6 +2069,8 @@ int main(int argc, char **argv)
                /* child */
                rc = assemble_mountinfo(parsed_info, thisprogram, mountpoint,
                                        orig_dev, orgoptions);
+               free(orgoptions);
+               free(mountpoint);
                return rc;
        } else {
                /* parent */
@@ -2209,5 +2216,6 @@ mount_exit:
        }
        free(options);
        free(orgoptions);
+       free(mountpoint);
        return rc;
 }