* [Qemu-devel] [PATCH] sd: sdhci: check data length during dma_memory_read
@ 2017-01-30 6:47 P J P
2017-01-30 10:30 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: P J P @ 2017-01-30 6:47 UTC (permalink / raw)
To: Qemu Developers; +Cc: Peter Maydell, Jiang Xin, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
While doing multi block SDMA transfer in routine
'sdhci_sdma_transfer_multi_blocks', the 's->fifo_buffer' starting
index 'begin' and data length 's->data_count' could end up to be same.
This could lead to an OOB access issue. Correct transfer data length
to avoid it.
Reported-by: Jiang Xin <jiangxin1@huawei.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
hw/sd/sdhci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 01fbf22..5bd5ab6 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -536,7 +536,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
boundary_count -= block_size - begin;
}
dma_memory_read(&address_space_memory, s->sdmasysad,
- &s->fifo_buffer[begin], s->data_count);
+ &s->fifo_buffer[begin], s->data_count - begin);
s->sdmasysad += s->data_count - begin;
if (s->data_count == block_size) {
for (n = 0; n < block_size; n++) {
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] sd: sdhci: check data length during dma_memory_read
2017-01-30 6:47 [Qemu-devel] [PATCH] sd: sdhci: check data length during dma_memory_read P J P
@ 2017-01-30 10:30 ` Peter Maydell
2017-02-03 13:14 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2017-01-30 10:30 UTC (permalink / raw)
To: P J P; +Cc: Qemu Developers, Jiang Xin, Prasad J Pandit, qemu-stable
On 30 January 2017 at 06:47, P J P <ppandit@redhat.com> wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> While doing multi block SDMA transfer in routine
> 'sdhci_sdma_transfer_multi_blocks', the 's->fifo_buffer' starting
> index 'begin' and data length 's->data_count' could end up to be same.
> This could lead to an OOB access issue. Correct transfer data length
> to avoid it.
>
> Reported-by: Jiang Xin <jiangxin1@huawei.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
> hw/sd/sdhci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index 01fbf22..5bd5ab6 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -536,7 +536,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
> boundary_count -= block_size - begin;
> }
> dma_memory_read(&address_space_memory, s->sdmasysad,
> - &s->fifo_buffer[begin], s->data_count);
> + &s->fifo_buffer[begin], s->data_count - begin);
> s->sdmasysad += s->data_count - begin;
> if (s->data_count == block_size) {
> for (n = 0; n < block_size; n++) {
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-stable@nongnu.org
thanks
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] sd: sdhci: check data length during dma_memory_read
2017-01-30 10:30 ` Peter Maydell
@ 2017-02-03 13:14 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2017-02-03 13:14 UTC (permalink / raw)
To: P J P; +Cc: Qemu Developers, Jiang Xin, Prasad J Pandit, qemu-stable
On 30 January 2017 at 10:30, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 30 January 2017 at 06:47, P J P <ppandit@redhat.com> wrote:
>> From: Prasad J Pandit <pjp@fedoraproject.org>
>>
>> While doing multi block SDMA transfer in routine
>> 'sdhci_sdma_transfer_multi_blocks', the 's->fifo_buffer' starting
>> index 'begin' and data length 's->data_count' could end up to be same.
>> This could lead to an OOB access issue. Correct transfer data length
>> to avoid it.
>>
>> Reported-by: Jiang Xin <jiangxin1@huawei.com>
>> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
>> ---
>> hw/sd/sdhci.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
>> index 01fbf22..5bd5ab6 100644
>> --- a/hw/sd/sdhci.c
>> +++ b/hw/sd/sdhci.c
>> @@ -536,7 +536,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
>> boundary_count -= block_size - begin;
>> }
>> dma_memory_read(&address_space_memory, s->sdmasysad,
>> - &s->fifo_buffer[begin], s->data_count);
>> + &s->fifo_buffer[begin], s->data_count - begin);
>> s->sdmasysad += s->data_count - begin;
>> if (s->data_count == block_size) {
>> for (n = 0; n < block_size; n++) {
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Cc: qemu-stable@nongnu.org
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-03 13:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-30 6:47 [Qemu-devel] [PATCH] sd: sdhci: check data length during dma_memory_read P J P
2017-01-30 10:30 ` Peter Maydell
2017-02-03 13:14 ` Peter Maydell
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.