summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2016-02-21 10:53:03 +0100
committerSasha Levin <sasha.levin@oracle.com>2016-03-13 13:53:41 -0400
commite50ea3c00d51da1b7cc860b312cc06b89ec51836 (patch)
treeb2e34847fbc008baa38d02f393d091b0b73a1a49
parentb8882250c376aaa4413b535692d5c6ba20a84800 (diff)
downloadlinux-e50ea3c00d51da1b7cc860b312cc06b89ec51836.tar.gz
linux-e50ea3c00d51da1b7cc860b312cc06b89ec51836.tar.bz2
linux-e50ea3c00d51da1b7cc860b312cc06b89ec51836.zip
ubi: Fix out of bounds write in volume update code
[ Upstream commit e4f6daac20332448529b11f09388f1d55ef2084c ] ubi_start_leb_change() allocates too few bytes. ubi_more_leb_change_data() will write up to req->upd_bytes + ubi->min_io_size bytes. Cc: stable@vger.kernel.org Signed-off-by: Richard Weinberger <richard@nod.at> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r--drivers/mtd/ubi/upd.c2
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;