From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 17 Jun 2011 12:49:12 +0000 (-0400)
Subject: cifs: don't leak nls on mount failure
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ca171baaad1420a29cca98be5bdf5596cd70b294;p=linux-beck.git

cifs: don't leak nls on mount failure

if cifs_sb allocation fails, we still need to drop nls we'd stashed
into volume_info - the one we would've copied to cifs_sb if we could
allocate the latter.

Acked-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index dc76c7bccb15..bfab2bc83726 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -672,6 +672,7 @@ cifs_do_mount(struct file_system_type *fs_type,
 	cifs_sb = kzalloc(sizeof(struct cifs_sb_info), GFP_KERNEL);
 	if (cifs_sb == NULL) {
 		root = ERR_PTR(-ENOMEM);
+		unload_nls(volume_info->local_nls);
 		goto out;
 	}