summaryrefslogtreecommitdiffstats
path: root/fs/ubifs/super.c
diff options
context:
space:
mode:
authorSidney Amani2012-05-18 13:32:37 +0200
committerArtem Bityutskiy2012-05-20 19:19:08 +0200
commit56b04e3e8b5cbf71c23a739f34f9a9437afa41fb (patch)
tree5eb86fdde125a73583f0063718978c6f40406c14 /fs/ubifs/super.c
parentUBIFS: make ubifs_lpt_init clean-up in case of failure (diff)
downloadkernel-qcow2-linux-56b04e3e8b5cbf71c23a739f34f9a9437afa41fb.tar.gz
kernel-qcow2-linux-56b04e3e8b5cbf71c23a739f34f9a9437afa41fb.tar.xz
kernel-qcow2-linux-56b04e3e8b5cbf71c23a739f34f9a9437afa41fb.zip
UBIFS: fix memory leak on error path
UBIFS leaks memory on error path in 'mount_ubifs()'. In case of failure in 'ubifs_fixup_free_space()', it does not call 'ubifs_lpt_free()' whereas LPT data structures can potentially be allocated. The amount of memory leaked can be quite high -- see 'ubifs_lpt_init()'. The bug was introduced when moving the LPT initialisation earlier in the mount process (commit '781c5717a95a74b294beb38b8276943b0f8b5bb4'). Signed-off-by: Sidney Amani <seed95@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ubifs/super.c')
-rw-r--r--fs/ubifs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 5b30c4db0d42..675b781b4699 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1301,7 +1301,7 @@ static int mount_ubifs(struct ubifs_info *c)
if (!c->ro_mount && c->space_fixup) {
err = ubifs_fixup_free_space(c);
if (err)
- goto out_master;
+ goto out_lpt;
}
if (!c->ro_mount) {