summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-01-29 16:17:57 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-11 15:53:25 +0200
commiteaa73bfe0269554bf16697b1997475d9d738b290 (patch)
treeb7f0f16c9dfa2f85be760aca6878743e32525054
parente621ee94ba356b1f439ef02eec3de94898d09593 (diff)
downloadbarebox-eaa73bfe0269554bf16697b1997475d9d738b290.tar.gz
barebox-eaa73bfe0269554bf16697b1997475d9d738b290.tar.xz
UBI: fix some use after free bugs
Move the kmem_cache_free() calls down a couple lines. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r--drivers/mtd/ubi/fastmap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index de68c326da..50db661403 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -462,8 +462,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
}
}
if (found_orphan) {
- kfree(tmp_aeb);
list_del(&tmp_aeb->u.list);
+ kfree(tmp_aeb);
}
new_aeb = kzalloc(sizeof(*new_aeb), GFP_KERNEL);
@@ -835,16 +835,16 @@ fail_bad:
ret = UBI_BAD_FASTMAP;
fail:
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) {
- free(tmp_aeb);
list_del(&tmp_aeb->u.list);
+ free(tmp_aeb);
}
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) {
- free(tmp_aeb);
list_del(&tmp_aeb->u.list);
+ free(tmp_aeb);
}
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &lfree, u.list) {
- free(tmp_aeb);
list_del(&tmp_aeb->u.list);
+ free(tmp_aeb);
}
return ret;