Fix memory leaks in cifs_do_mount()

Fix memory leaks introduced by the patch
fs/cifs: make share unaccessible at root level mountable

Also move allocation of cifs_sb->prepath to cifs_setup_cifs_sb().

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Tested-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 8 insertions, 12 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 6bbec5e784cd..cc9cdab52dab 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -686,26 +686,22 @@ cifs_do_mount(struct file_system_type *fs_type,
         cifs_sb->mountdata = kstrndup(data, PAGE_SIZE, GFP_KERNEL);
         if (cifs_sb->mountdata == NULL) {
                 root = ERR_PTR(-ENOMEM);
-                goto out_cifs_sb;
+                goto out_free;
         }
 
-        if (volume_info->prepath) {
-                cifs_sb->prepath = kstrdup(volume_info->prepath, GFP_KERNEL);
-                if (cifs_sb->prepath == NULL) {
-                        root = ERR_PTR(-ENOMEM);
-                        goto out_cifs_sb;
-                }
+        rc = cifs_setup_cifs_sb(volume_info, cifs_sb);
+        if (rc) {
+                root = ERR_PTR(rc);
+                goto out_free;
         }
 
-        cifs_setup_cifs_sb(volume_info, cifs_sb);
-
         rc = cifs_mount(cifs_sb, volume_info);
         if (rc) {
                 if (!(flags & MS_SILENT))
                         cifs_dbg(VFS, "cifs_mount failed w/return code = %d\n",
                                  rc);
                 root = ERR_PTR(rc);
-                goto out_mountdata;
+                goto out_free;
         }
 
         mnt_data.vol = volume_info;
@@ -752,9 +748,9 @@ out:
         cifs_cleanup_volume_info(volume_info);
         return root;
 
-out_mountdata:
+out_free:
+        kfree(cifs_sb->prepath);
         kfree(cifs_sb->mountdata);
-out_cifs_sb:
         kfree(cifs_sb);
 out_nls:
         unload_nls(volume_info->local_nls);