diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2011-05-26 00:02:16 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-05-27 03:45:37 +0000 |
| commit | 641a58d66d086327042e9d73c6606fd02c8f067c (patch) | |
| tree | d34ce82a1971daef0735c398924e3161c22b8391 | |
| parent | 6848b7334b24b47aa3d0e70342ff839ffa95d5fa (diff) | |
| download | linux-3.10-641a58d66d086327042e9d73c6606fd02c8f067c.tar.gz linux-3.10-641a58d66d086327042e9d73c6606fd02c8f067c.tar.bz2 linux-3.10-641a58d66d086327042e9d73c6606fd02c8f067c.zip | |
CIFS: Fix memory leak in cifs_do_mount
and simplify error handling code.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/cifsfs.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index d1ed7f9946d..1d2a93c60e7 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -556,9 +556,8 @@ cifs_do_mount(struct file_system_type *fs_type, sb = sget(fs_type, NULL, set_anon_super, NULL); if (IS_ERR(sb)) { - kfree(cifs_sb); root = ERR_CAST(sb); - goto out; + goto out_cifs_sb; } /* @@ -569,7 +568,7 @@ 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 err_out; + goto out_super; } sb->s_flags = flags; @@ -581,21 +580,23 @@ cifs_do_mount(struct file_system_type *fs_type, flags & MS_SILENT ? 1 : 0); if (rc) { root = ERR_PTR(rc); - goto err_out; + goto out_super; } sb->s_flags |= MS_ACTIVE; root = dget(sb->s_root); -out: - cifs_cleanup_volume_info(&volume_info); - return root; + goto out; -err_out: +out_super: kfree(cifs_sb->mountdata); + deactivate_locked_super(sb); + +out_cifs_sb: unload_nls(cifs_sb->local_nls); kfree(cifs_sb); - deactivate_locked_super(sb); + +out: cifs_cleanup_volume_info(&volume_info); return root; } |