aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2013-02-04 11:03:34 -0500
committerSteven Rostedt <rostedt@goodmis.org>2013-02-04 11:03:34 -0500
commitf479dad7484e2cefe74e59f7244fb863644baa6e (patch)
tree05f147ba2b8973d0b744f0d91f69ef1e70a2bcbb /fs
parent8ae3f96840e6074d3f869481cc49486a9c022f91 (diff)
parente1c63f9f42393f7c1dc072db7e0d54e599e96b46 (diff)
Merge tag 'v3.0.62' into v3.0-rt
This is the 3.0.62 stable release
Diffstat (limited to 'fs')
-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 8d8f28c94c0f..51feb1aff599 100644
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -225,6 +225,8 @@ compose_mount_options_out:
compose_mount_options_err:
kfree(mountdata);
mountdata = ERR_PTR(rc);
+ kfree(*devname);
+ *devname = NULL;
goto compose_mount_options_out;
}