* [PATCH] UBI: Validate data_size
@ 2015-09-22 21:58 Richard Weinberger
2015-09-24 10:37 ` David Gstir
0 siblings, 1 reply; 3+ messages in thread
From: Richard Weinberger @ 2015-09-22 21:58 UTC (permalink / raw)
To: linux-mtd; +Cc: linux-kernel, Richard Weinberger, stable
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().
Cc: stable@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/mtd/ubi/io.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 5bbd1f0..1fc23e4 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
--
1.8.4.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] UBI: Validate data_size
2015-09-22 21:58 [PATCH] UBI: Validate data_size Richard Weinberger
@ 2015-09-24 10:37 ` David Gstir
2015-09-25 19:40 ` Richard Weinberger
0 siblings, 1 reply; 3+ messages in thread
From: David Gstir @ 2015-09-24 10:37 UTC (permalink / raw)
To: Richard Weinberger; +Cc: linux-mtd, linux-kernel, stable
> On 22.09.2015, at 23:58, Richard Weinberger <richard@nod.at> wrote:
>
> 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().
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> drivers/mtd/ubi/io.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
> index 5bbd1f0..1fc23e4 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;
> + }
> +
Nice catch!
Reviewed-by: David Gstir <david@sigma-star.at>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] UBI: Validate data_size
2015-09-24 10:37 ` David Gstir
@ 2015-09-25 19:40 ` Richard Weinberger
0 siblings, 0 replies; 3+ messages in thread
From: Richard Weinberger @ 2015-09-25 19:40 UTC (permalink / raw)
To: David Gstir; +Cc: linux-mtd, linux-kernel, stable
Am 24.09.2015 um 12:37 schrieb David Gstir:
>
>> On 22.09.2015, at 23:58, Richard Weinberger <richard@nod.at> wrote:
>>
>> 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().
>>
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Richard Weinberger <richard@nod.at>
>> ---
>> drivers/mtd/ubi/io.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
>> index 5bbd1f0..1fc23e4 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;
>> + }
>> +
>
> Nice catch!
>
> Reviewed-by: David Gstir <david@sigma-star.at>
Applied and queued for 4.3-rc.
Thanks,
//richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-25 19:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 21:58 [PATCH] UBI: Validate data_size Richard Weinberger
2015-09-24 10:37 ` David Gstir
2015-09-25 19:40 ` Richard Weinberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).