From: Vasily Khoruzhick <anarsoul@gmail.com>
To: Marek Vasut <marek.vasut@gmail.com>,
"Russell King - ARM Linux" <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org,
spi-devel-general@lists.sourceforge.net, Eric Miao <eri
Cc: Vasily Khoruzhick <anarsoul@gmail.com>
Subject: [PATCH v2] pxa2xx_spi: fix memory corruption
Date: Sun, 10 Jul 2011 15:09:22 +0300 [thread overview]
Message-ID: <1310299762-20079-1-git-send-email-anarsoul@gmail.com> (raw)
In-Reply-To: <201107100957.06377.marek.vasut@gmail.com>
pxa2xx_spi_probe allocates struct driver_data and null_dma_buf
at same time via spi_alloc_master(), but then calculates
null_dma_buf pointer incorrectly, and it causes memory corruption
later if DMA usage is enabled.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
v2: - add u8 __null_dma_buf[16] to the end of driver_data structure
and use it as null_dma_buf after alignment.
- use PTR_ALIGN instead of ALIGN
drivers/spi/pxa2xx_spi.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index dc25bee..25358cd 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -106,6 +106,7 @@ struct driver_data {
int rx_channel;
int tx_channel;
u32 *null_dma_buf;
+ u8 __null_dma_buf[16];
/* SSP register addresses */
void __iomem *ioaddr;
@@ -1543,8 +1544,8 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev)
return -ENODEV;
}
- /* Allocate master with space for drv_data and null dma buffer */
- master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
+ /* Allocate master with space for drv_data */
+ master = spi_alloc_master(dev, sizeof(struct driver_data));
if (!master) {
dev_err(&pdev->dev, "cannot alloc spi_master\n");
pxa_ssp_free(ssp);
@@ -1569,8 +1570,8 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev)
master->transfer = transfer;
drv_data->ssp_type = ssp->type;
- drv_data->null_dma_buf = (u32 *)ALIGN((u32)(drv_data +
- sizeof(struct driver_data)), 8);
+ drv_data->null_dma_buf =
+ (u32 *)PTR_ALIGN((u8 *)drv_data->__null_dma_buf, 8);
drv_data->ioaddr = ssp->mmio_base;
drv_data->ssdr_physical = ssp->phys_base + SSDR;
--
1.7.5.rc3
next prev parent reply other threads:[~2011-07-10 12:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-09 21:14 [PATCH] pxa2xx_spi: fix memory corruption Vasily Khoruzhick
2011-07-09 23:05 ` Marek Vasut
2011-07-09 23:11 ` Russell King - ARM Linux
2011-07-10 7:14 ` Marek Vasut
[not found] ` <201107100914.45452.marek.vasut-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-07-10 7:57 ` Marek Vasut
2011-07-10 12:09 ` Vasily Khoruzhick [this message]
2011-07-10 12:43 ` [PATCH v2] " Marek Vasut
2011-07-10 13:09 ` Vasily Khoruzhick
2011-07-10 15:18 ` [PATCH v3] " Vasily Khoruzhick
[not found] ` <1310311099-24638-1-git-send-email-anarsoul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-07-14 12:17 ` Vasily Khoruzhick
[not found] ` <201107141517.36147.anarsoul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-07-14 12:21 ` Marek Vasut
2011-07-15 2:53 ` Grant Likely
2011-07-15 8:12 ` Russell King - ARM Linux
[not found] ` <20110715081242.GM23270-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-07-15 19:50 ` Grant Likely
2011-07-15 20:24 ` Russell King - ARM Linux
2011-07-15 21:31 ` Grant Likely
2011-07-18 10:10 ` Russell King - ARM Linux
2011-07-18 7:56 ` Vasily Khoruzhick
[not found] ` <201107181056.51782.anarsoul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-11-29 14:05 ` Vasily Khoruzhick
2011-11-29 14:31 ` Marek Vasut
2011-12-07 20:35 ` Wolfram Sang
[not found] ` <20111207203559.GB3744-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2011-12-08 8:19 ` [RESEND PATCH " Vasily Khoruzhick
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=1310299762-20079-1-git-send-email-anarsoul@gmail.com \
--to=anarsoul@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=marek.vasut@gmail.com \
--cc=spi-devel-general@lists.sourceforge.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).