diff options
author | Richard Weinberger <richard@nod.at> | 2015-09-22 23:58:07 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2015-10-28 16:38:05 +0100 |
commit | a8d61c5216f2602ec4d46a89fa6f74e9646ea088 (patch) | |
tree | 9a95cd0eadf72940b718fc8b05d3f91cc28fa33d | |
parent | 5c78135494fd42dfcf224f9b290c0ed9408da732 (diff) |
UBI: Validate data_size
commit 281fda27673f833a01d516658a64d22a32c8e072 upstream.
Make sure that data_size is less than LEB size.
Otherwise a handcrafted UBI image is able to trigger
an out of bounds memory access in ubi_compare_lebs().
Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: David Gstir <david@sigma-star.at>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | drivers/mtd/ubi/io.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index bf79def40126..8822e880833b 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -931,6 +931,11 @@ static int validate_vid_hdr(const struct ubi_device *ubi, goto bad; } + if (data_size > ubi->leb_size) { + ubi_err("bad data_size"); + goto bad; + } + if (vol_type == UBI_VID_STATIC) { /* * Although from high-level point of view static volumes may |