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:39:21 -0700 |
| commit | 2210f9853ede87346f9733fae5d781c029193536 (patch) | |
| tree | 10a355d20efe2dda292613853f8af27b006fba82 /drivers/mtd | |
| parent | 25b030bbdc8d6a36b9c2fbbbb8b806f846fc4a89 (diff) | |
| download | lwn-2210f9853ede87346f9733fae5d781c029193536.tar.gz lwn-2210f9853ede87346f9733fae5d781c029193536.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>
Diffstat (limited to 'drivers/mtd')
| -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 d36134925d31..db657f2168d7 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -921,6 +921,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 |