Skip to content

Commit

Permalink
UBI: Validate data_size
Browse files Browse the repository at this point in the history
commit 281fda2 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>
  • Loading branch information
Richard Weinberger authored and Greg Kroah-Hartman committed Oct 22, 2015
1 parent 892e053 commit a5bae33
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/mtd/ubi/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a5bae33

Please sign in to comment.