---

yaml --- r: 360521 b: refs/heads/master c: 3e36a16 h: refs/heads/master i: 360519: 4291c0a v: v3
git-mirror · Mar 2, 2013 · fb6f496 · fb6f496
1 parent 961fbd3
commit fb6f496
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df05c1b85a88888b92725ef27ba70086f38fb083
+refs/heads/master: 3e36a16375eee390a9d80f99499fe630efa08128
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -4543,6 +4543,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 			if (!old_opts.s_qf_names[i]) {
 				for (j = 0; j < i; j++)
 					kfree(old_opts.s_qf_names[j]);
+				kfree(orig_data);
 				return -ENOMEM;
 			}
 		} else