Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50234c58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi 

Pull ubi fix from Artem Bityutskiy:
 "A single small fix for memory deallocation: we allocated memory using
  'kmem_cache_alloc()' but were freeing it using 'kfree()' in some
  cases.  Now we fix this by using 'kmem_cache_free()' instead."

* tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi:
  UBI: fix a horrible memory deallocation bug
parents ed6fe9d6 78b495c3

drivers/mtd/ubi/vtbl.c

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_attach_info *ai, 
	 * of this LEB as it will be deleted and freed in 'ubi_add_to_av()'.

	 */

	err = ubi_add_to_av(ubi, ai, new_aeb->pnum, new_aeb->ec, vid_hdr, 0);

	kfree(new_aeb);

	kmem_cache_free(ai->aeb_slab_cache, new_aeb);

	ubi_free_vid_hdr(ubi, vid_hdr);

	return err;
@@ -353,7 +353,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_attach_info *ai, 
		list_add(&new_aeb->u.list, &ai->erase);

		goto retry;

	}

	kfree(new_aeb);

	kmem_cache_free(ai->aeb_slab_cache, new_aeb);

out_free:

	ubi_free_vid_hdr(ubi, vid_hdr);

	return err;