summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCong Ding <dinggnu@gmail.com>2013-01-22 19:20:58 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-03 18:24:40 -0600
commitbad73b66c3862db14a5362113df7680f4ef84200 (patch)
tree1ed494de40ebd3b91ef174fc2f2162eeb8ac262a
parent83829ab554f01ee5fcef4880b0a90cc14350b936 (diff)
downloadlinux-3.10-bad73b66c3862db14a5362113df7680f4ef84200.tar.gz
linux-3.10-bad73b66c3862db14a5362113df7680f4ef84200.tar.bz2
linux-3.10-bad73b66c3862db14a5362113df7680f4ef84200.zip
fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
commit 10b8c7dff5d3633b69e77f57d404dab54ead3787 upstream. When it goes to error through line 144, the memory allocated to *devname is not freed, and the caller doesn't free it either in line 250. So we free the memroy of *devname in function cifs_compose_mount_options() when it goes to error. Signed-off-by: Cong Ding <dinggnu@gmail.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/cifs/cifs_dfs_ref.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index 6873bb634a9..22631445a4a 100644
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -226,6 +226,8 @@ compose_mount_options_out:
compose_mount_options_err:
kfree(mountdata);
mountdata = ERR_PTR(rc);
+ kfree(*devname);
+ *devname = NULL;
goto compose_mount_options_out;
}