summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-02-28 02:23:26 -0800
committerLuis Henriques <luis.henriques@canonical.com>2015-05-05 11:09:35 +0100
commit5f9754ddade047e29202bdaca9956b7ea0c27dc0 (patch)
tree2a10edbbd76aabfc1f26f951026e427231350935 /drivers/mtd
parenta46c57770b946e0cbc2a4f2568cbaaaad0dc97a3 (diff)
downloadlinux-stable-5f9754ddade047e29202bdaca9956b7ea0c27dc0.tar.gz
linux-stable-5f9754ddade047e29202bdaca9956b7ea0c27dc0.tar.bz2
linux-stable-5f9754ddade047e29202bdaca9956b7ea0c27dc0.zip
UBI: fix out of bounds write
commit d74adbdb9abf0d2506a6c4afa534d894f28b763f upstream. If aeb->len >= vol->reserved_pebs, we should not be writing aeb into the PEB->LEB mapping. Caught by Coverity, CID #711212. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/eba.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 0e11671dadc4..930cf2c77abb 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1362,7 +1362,8 @@ int ubi_eba_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
* during re-size.
*/
ubi_move_aeb_to_list(av, aeb, &ai->erase);
- vol->eba_tbl[aeb->lnum] = aeb->pnum;
+ else
+ vol->eba_tbl[aeb->lnum] = aeb->pnum;
}
}