aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2018-06-12 20:49:45 +0200
committerRichard Weinberger <richard@nod.at>2018-08-15 00:06:15 +0200
commiteef19816ada3abd56d9f20c88794cc2fea83ebb2 (patch)
tree07bc63a188ebd12f52fd0f92103a356acef807f6 /fs/ubifs
parentubi: Initialize Fastmap checkmapping correctly (diff)
downloadlinux-dev-eef19816ada3abd56d9f20c88794cc2fea83ebb2.tar.xz
linux-dev-eef19816ada3abd56d9f20c88794cc2fea83ebb2.zip
ubifs: Fix memory leak in lprobs self-check
Allocate the buffer after we return early. Otherwise memory is being leaked. Cc: <stable@vger.kernel.org> Fixes: 1e51764a3c2a ("UBIFS: add new flash file system") Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/lprops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index f5a46844340c..8ade493a423a 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -1089,10 +1089,6 @@ static int scan_check_cb(struct ubifs_info *c,
}
}
- buf = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL);
- if (!buf)
- return -ENOMEM;
-
/*
* After an unclean unmount, empty and freeable LEBs
* may contain garbage - do not scan them.
@@ -1111,6 +1107,10 @@ static int scan_check_cb(struct ubifs_info *c,
return LPT_SCAN_CONTINUE;
}
+ buf = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
sleb = ubifs_scan(c, lnum, 0, buf, 0);
if (IS_ERR(sleb)) {
ret = PTR_ERR(sleb);