summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Muees <wolfgang.mues@auerswald.de>2010-03-05 13:43:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:26:37 -0800
commit0b3520f2df8e4e5dad6a7b2743d037bf06c22024 (patch)
treec3cb1b36e5a4e05f94be6ac9c92da4bdcf4b5734
parentdc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 (diff)
downloadop-kernel-dev-0b3520f2df8e4e5dad6a7b2743d037bf06c22024.zip
op-kernel-dev-0b3520f2df8e4e5dad6a7b2743d037bf06c22024.tar.gz
mmc: at91_mci: fix pointer errors
Fixes two pointer errors, one which leads to memory overwrites if used with large chunks of data. Signed-off-by: Wolfgang Muees <wolfgang.mues@auerswald.de> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Andrew Victor <avictor.za@gmail.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mmc/host/at91_mci.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 63924e0..4e1b2e6 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -227,11 +227,13 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
for (index = 0; index < (amount / 4); index++)
*dmabuf++ = swab32(sgbuffer[index]);
} else {
- memcpy(dmabuf, sgbuffer, amount);
- dmabuf += amount;
+ char *tmpv = (char *)dmabuf;
+ memcpy(tmpv, sgbuffer, amount);
+ tmpv += amount;
+ dmabuf = (unsigned *)tmpv;
}
- kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);
+ kunmap_atomic(((void *)sgbuffer) - sg->offset, KM_BIO_SRC_IRQ);
if (size == 0)
break;
OpenPOWER on IntegriCloud