From: "Wu, Songjun" <Songjun.Wu@microchip.com>
To: Colin Ian King <colin.king@canonical.com>,
wharms@bfs.de, Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] [media] atmel-isc: fix off-by-one comparison and out of bounds read issue
Date: Mon, 13 Mar 2017 02:14:07 +0000 [thread overview]
Message-ID: <69c8d3b5-5edd-7adc-a764-42a67e98067b@microchip.com> (raw)
In-Reply-To: <c19ce380-2355-3a1f-1896-3eab4c75dca6@canonical.com>
On 3/9/2017 19:50, Colin Ian King wrote:
> On 09/03/17 11:49, walter harms wrote:
>>
>>
>> Am 09.03.2017 11:57, schrieb Hans Verkuil:
>>> Hi Songjun,
>>>
>>> On 08/03/17 03:25, Wu, Songjun wrote:
>>>> Hi Colin,
>>>>
>>>> Thank you for your comment.
>>>> It is a bug, will be fixed in the next patch.
>>>
>>> Do you mean that you will provide a new patch for this? Is there anything
>>> wrong with this patch? It seems reasonable to me.
>>>
>>> Regards,
>>>
>>> Hans
>>>
>>
>>
>>
>> perhaps he will make it a bit more readable, like:
>>
>> *hist_count += i * (*hist_entry++);
>>
>> *hist_count += hist_entry[i]*i;
>
> As long as it gets fixed somehow, then I'm happy.
>
You suggestion is very good, I will modify it like this.
Thank you.
> Colin
>>
>>
>> re,
>> wh
>>>>
>>>> On 3/7/2017 22:30, Colin King wrote:
>>>>> From: Colin Ian King <colin.king@canonical.com>
>>>>>
>>>>> The are only HIST_ENTRIES worth of entries in hist_entry however the
>>>>> for-loop is iterating one too many times leasing to a read access off
>>>>> the end off the array ctrls->hist_entry. Fix this by iterating by
>>>>> the correct number of times.
>>>>>
>>>>> Detected by CoverityScan, CID#1415279 ("Out-of-bounds read")
>>>>>
>>>>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>>>>> ---
>>>>> drivers/media/platform/atmel/atmel-isc.c | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
>>>>> index b380a7d..7dacf8c 100644
>>>>> --- a/drivers/media/platform/atmel/atmel-isc.c
>>>>> +++ b/drivers/media/platform/atmel/atmel-isc.c
>>>>> @@ -1298,7 +1298,7 @@ static void isc_hist_count(struct isc_device *isc)
>>>>> regmap_bulk_read(regmap, ISC_HIS_ENTRY, hist_entry, HIST_ENTRIES);
>>>>>
>>>>> *hist_count = 0;
>>>>> - for (i = 0; i <= HIST_ENTRIES; i++)
>>>>> + for (i = 0; i < HIST_ENTRIES; i++)
>>>>> *hist_count += i * (*hist_entry++);
>>>>> }
>>>>>
>>>>>
>>>
>>
>>
>>
>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>
WARNING: multiple messages have this Message-ID (diff)
From: "Wu, Songjun" <Songjun.Wu@microchip.com>
To: Colin Ian King <colin.king@canonical.com>, <wharms@bfs.de>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
<linux-media@vger.kernel.org>, <kernel-janitors@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] [media] atmel-isc: fix off-by-one comparison and out of bounds read issue
Date: Mon, 13 Mar 2017 10:14:07 +0800 [thread overview]
Message-ID: <69c8d3b5-5edd-7adc-a764-42a67e98067b@microchip.com> (raw)
In-Reply-To: <c19ce380-2355-3a1f-1896-3eab4c75dca6@canonical.com>
On 3/9/2017 19:50, Colin Ian King wrote:
> On 09/03/17 11:49, walter harms wrote:
>>
>>
>> Am 09.03.2017 11:57, schrieb Hans Verkuil:
>>> Hi Songjun,
>>>
>>> On 08/03/17 03:25, Wu, Songjun wrote:
>>>> Hi Colin,
>>>>
>>>> Thank you for your comment.
>>>> It is a bug, will be fixed in the next patch.
>>>
>>> Do you mean that you will provide a new patch for this? Is there anything
>>> wrong with this patch? It seems reasonable to me.
>>>
>>> Regards,
>>>
>>> Hans
>>>
>>
>>
>>
>> perhaps he will make it a bit more readable, like:
>>
>> *hist_count += i * (*hist_entry++);
>>
>> *hist_count += hist_entry[i]*i;
>
> As long as it gets fixed somehow, then I'm happy.
>
You suggestion is very good, I will modify it like this.
Thank you.
> Colin
>>
>>
>> re,
>> wh
>>>>
>>>> On 3/7/2017 22:30, Colin King wrote:
>>>>> From: Colin Ian King <colin.king@canonical.com>
>>>>>
>>>>> The are only HIST_ENTRIES worth of entries in hist_entry however the
>>>>> for-loop is iterating one too many times leasing to a read access off
>>>>> the end off the array ctrls->hist_entry. Fix this by iterating by
>>>>> the correct number of times.
>>>>>
>>>>> Detected by CoverityScan, CID#1415279 ("Out-of-bounds read")
>>>>>
>>>>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>>>>> ---
>>>>> drivers/media/platform/atmel/atmel-isc.c | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
>>>>> index b380a7d..7dacf8c 100644
>>>>> --- a/drivers/media/platform/atmel/atmel-isc.c
>>>>> +++ b/drivers/media/platform/atmel/atmel-isc.c
>>>>> @@ -1298,7 +1298,7 @@ static void isc_hist_count(struct isc_device *isc)
>>>>> regmap_bulk_read(regmap, ISC_HIS_ENTRY, hist_entry, HIST_ENTRIES);
>>>>>
>>>>> *hist_count = 0;
>>>>> - for (i = 0; i <= HIST_ENTRIES; i++)
>>>>> + for (i = 0; i < HIST_ENTRIES; i++)
>>>>> *hist_count += i * (*hist_entry++);
>>>>> }
>>>>>
>>>>>
>>>
>>
>>
>>
>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>
next prev parent reply other threads:[~2017-03-13 2:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-07 14:30 [PATCH] [media] atmel-isc: fix off-by-one comparison and out of bounds read issue Colin King
2017-03-07 14:30 ` Colin King
2017-03-08 2:25 ` Wu, Songjun
2017-03-08 2:25 ` Wu, Songjun
2017-03-09 10:57 ` Hans Verkuil
2017-03-09 10:57 ` Hans Verkuil
2017-03-09 11:49 ` walter harms
2017-03-09 11:49 ` walter harms
2017-03-09 11:50 ` Colin Ian King
2017-03-09 11:50 ` Colin Ian King
2017-03-13 2:14 ` Wu, Songjun [this message]
2017-03-13 2:14 ` Wu, Songjun
2017-03-13 5:53 ` Wu, Songjun
2017-03-13 5:53 ` Wu, Songjun
2017-03-13 9:25 ` Hans Verkuil
2017-03-13 9:25 ` Hans Verkuil
2017-03-13 9:32 ` Wu, Songjun
2017-03-13 9:32 ` Wu, Songjun
2017-03-13 10:23 ` Hans Verkuil
2017-03-13 10:23 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=69c8d3b5-5edd-7adc-a764-42a67e98067b@microchip.com \
--to=songjun.wu@microchip.com \
--cc=colin.king@canonical.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=wharms@bfs.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.