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

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index 2a1b6e037e1a..0134ba32a057 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -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;