diff options
| author | Richard Weinberger <richard@nod.at> | 2015-09-22 23:58:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 14:49:32 -0700 |
| commit | fc4337962e4d27410acc27a77d962d823a24aff6 (patch) | |
| tree | 23e70a8286be14eef1c2011aad64f7d1be77fa73 | |
| parent | b8e759b6839ac3595d958fdb61828f7fb9066f49 (diff) | |
| download | lwn-fc4337962e4d27410acc27a77d962d823a24aff6.tar.gz lwn-fc4337962e4d27410acc27a77d962d823a24aff6.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 5bbd1f094f4e..1fc23e48fe8e 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -926,6 +926,11 @@ static int validate_vid_hdr(const struct ubi_device *ubi, goto bad; } + if (data_size > ubi->leb_size) { + ubi_err(ubi, "bad data_size"); + goto bad; + } + if (vol_type == UBI_VID_STATIC) { /* * Although from high-level point of view static volumes may |