Commit a58b9ada authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-4.5-rc7' of git://git.infradead.org/linux-ubifs 

Pull UBI fix from Richard Weinberger:
 "This contains a single bug fix for UBI"

* tag 'upstream-4.5-rc7' of git://git.infradead.org/linux-ubifs:
  ubi: Fix out of bounds write in volume update code
parents 1306b047 e4f6daac

drivers/mtd/ubi/upd.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int ubi_start_leb_change(struct ubi_device *ubi, struct ubi_volume *vol, 
	vol->changing_leb = 1;

	vol->ch_lnum = req->lnum;



	vol->upd_buf = vmalloc(req->bytes);

	vol->upd_buf = vmalloc(ALIGN((int)req->bytes, ubi->min_io_size));

	if (!vol->upd_buf)

		return -ENOMEM;