[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] sd: fix card size checking on R/W accesses
From: |
Vincent Palatin |
Subject: |
[Qemu-devel] [PATCH 2/7] sd: fix card size checking on R/W accesses |
Date: |
Mon, 25 Jul 2011 16:19:06 -0700 |
We need to check that we are not crossing the boundaries of the card for
the current access not for the next one which might not happen.
Signed-off-by: Vincent Palatin <address@hidden>
---
hw/sd.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/sd.c b/hw/sd.c
index f48d589..de477fe 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -1451,11 +1451,6 @@ void sd_write_data(SDState *sd, uint8_t value)
sd->data[sd->data_offset ++] = value;
if (sd->data_offset >= sd->blk_len) {
/* TODO: Check CRC before committing */
- sd->state = sd_programming_state;
- BLK_WRITE_BLOCK(sd->data_start, sd->data_offset);
- sd->blk_written ++;
- sd->data_start += sd->blk_len;
- sd->data_offset = 0;
if (sd->data_start + sd->blk_len > sd->size) {
sd->card_status |= ADDRESS_ERROR;
break;
@@ -1464,6 +1459,11 @@ void sd_write_data(SDState *sd, uint8_t value)
sd->card_status |= WP_VIOLATION;
break;
}
+ sd->state = sd_programming_state;
+ BLK_WRITE_BLOCK(sd->data_start, sd->data_offset);
+ sd->blk_written ++;
+ sd->data_start += sd->blk_len;
+ sd->data_offset = 0;
sd->csd[14] |= 0x40;
/* Bzzzzzzztt .... Operation complete. */
@@ -1606,17 +1606,19 @@ uint8_t sd_read_data(SDState *sd)
break;
case 18: /* CMD18: READ_MULTIPLE_BLOCK */
- if (sd->data_offset == 0)
+ if (sd->data_offset == 0) {
+ if (sd->data_start + io_len > sd->size) {
+ sd->card_status |= ADDRESS_ERROR;
+ ret = 0;
+ break;
+ }
BLK_READ_BLOCK(sd->data_start, io_len);
+ }
ret = sd->data[sd->data_offset ++];
if (sd->data_offset >= io_len) {
sd->data_start += io_len;
sd->data_offset = 0;
- if (sd->data_start + io_len > sd->size) {
- sd->card_status |= ADDRESS_ERROR;
- break;
- }
}
break;
--
1.7.3.1
- [Qemu-devel] sd: add SDHCI and eMMC support, Vincent Palatin, 2011/07/25
- [Qemu-devel] [PATCH 3/7] block: add eMMC block device type, Vincent Palatin, 2011/07/25
- [Qemu-devel] [PATCH 4/7] sd: add eMMC support, Vincent Palatin, 2011/07/25
- [Qemu-devel] [PATCH 7/7] sd: compile SDHCI on PCI platforms, Vincent Palatin, 2011/07/25
- [Qemu-devel] [PATCH 2/7] sd: fix card size checking on R/W accesses,
Vincent Palatin <=
- [Qemu-devel] [PATCH 5/7] sd: add PCI ids for SDHCI controller, Vincent Palatin, 2011/07/25
- [Qemu-devel] [PATCH 1/7] sd: do not add one sector to the disk size, Vincent Palatin, 2011/07/25
- [Qemu-devel] [PATCH 6/7] sd: add SD Host Controller (SDHCI) emulation, Vincent Palatin, 2011/07/25