summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2014-09-03 19:11:09 +0200
committerAl Viro2014-09-14 04:13:39 +0200
commitf77ced6637a18d4f543458a112881776a6b7fa8c (patch)
tree463fc9c5970252940d08b2976889a33b8e7a5e88
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
downloadkernel-qcow2-linux-f77ced6637a18d4f543458a112881776a6b7fa8c.tar.gz
kernel-qcow2-linux-f77ced6637a18d4f543458a112881776a6b7fa8c.tar.xz
kernel-qcow2-linux-f77ced6637a18d4f543458a112881776a6b7fa8c.zip
[fix] lustre: d_make_root() does iput() on dentry allocation failure
double-free is a bad thing Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/staging/lustre/lustre/llite/llite_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 0367f5a2cfe4..0c59e26c0805 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -568,7 +568,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
if (sb->s_root == NULL) {
CERROR("%s: can't make root dentry\n",
ll_get_fsname(sb, NULL, 0));
- GOTO(out_root, err = -ENOMEM);
+ GOTO(out_lock_cn_cb, err = -ENOMEM);
}
sbi->ll_sdev_orig = sb->s_dev;