Commit bb7d43b1 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'upstream-3.14-rc5' of git://git.infradead.org/linux-ubifs

Pull ubifs fix from Artem Bityutskiy:
 "Just a single fix for the UBI module unload path which makes sure we
  do not touch freed memory"

* tag 'upstream-3.14-rc5' of git://git.infradead.org/linux-ubifs:
  UBI: fix some use after free bugs
parents d2a04763 5547fec7
...@@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, ...@@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
} }
} }
if (found_orphan) { if (found_orphan) {
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list); list_del(&tmp_aeb->u.list);
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
} }
new_aeb = kmem_cache_alloc(ai->aeb_slab_cache, new_aeb = kmem_cache_alloc(ai->aeb_slab_cache,
...@@ -846,16 +846,16 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, ...@@ -846,16 +846,16 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
ret = UBI_BAD_FASTMAP; ret = UBI_BAD_FASTMAP;
fail: fail:
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) { list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) {
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list); list_del(&tmp_aeb->u.list);
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
} }
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) { list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) {
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list); list_del(&tmp_aeb->u.list);
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
} }
list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) { list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) {
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
list_del(&tmp_aeb->u.list); list_del(&tmp_aeb->u.list);
kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment