3 files changed, 18 insertions, 14 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);
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 1243bd326591..95dab43646f0 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -184,7 +184,7 @@ extern int cifs_read_from_socket(struct TCP_Server_Info *server, char *buf,
                                  unsigned int to_read);
 extern int cifs_read_page_from_socket(struct TCP_Server_Info *server,
                                       struct page *page, unsigned int to_read);
-extern void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
+extern int cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
                                struct cifs_sb_info *cifs_sb);
 extern int cifs_match_super(struct super_block *, void *);
 extern void cifs_cleanup_volume_info(struct smb_vol *pvolume_info);
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 7ae03283bd61..4546926680d4 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3222,7 +3222,7 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon,
         }
 }
 
-void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
+int cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
                         struct cifs_sb_info *cifs_sb)
 {
         INIT_DELAYED_WORK(&cifs_sb->prune_tlinks, cifs_prune_tlinks);
@@ -3316,6 +3316,14 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
 
         if ((pvolume_info->cifs_acl) && (pvolume_info->dynperm))
                 cifs_dbg(VFS, "mount option dynperm ignored if cifsacl mount option supported\n");
+
+        if (pvolume_info->prepath) {
+                cifs_sb->prepath = kstrdup(pvolume_info->prepath, GFP_KERNEL);
+                if (cifs_sb->prepath == NULL)
+                        return -ENOMEM;
+        }
+
+        return 0;
 }
 
 static void