From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Date: Mon, 4 Aug 2014 13:41:54 +0000 (+0100)
Subject: sd: sdhci: Fix ADMA dma_memory_read access
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~661^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9db11cef8c557ccc6e0a3e7eca786b197eed5f59;p=sdk%2Femulator%2Fqemu.git

sd: sdhci: Fix ADMA dma_memory_read access

This dma_memory_read was giving too big a size when begin was non-zero.
This could cause segfaults in some circumstances. Fix.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index b5a9eee..f9fe700 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -702,7 +702,8 @@ static void sdhci_do_adma(SDHCIState *s)
                         length -= block_size - begin;
                     }
                     dma_memory_read(&address_space_memory, dscr.addr,
-                                    &s->fifo_buffer[begin], s->data_count);
+                                    &s->fifo_buffer[begin],
+                                    s->data_count - begin);
                     dscr.addr += s->data_count - begin;
                     if (s->data_count == block_size) {
                         for (n = 0; n < block_size; n++) {