From: marek.vasut@gmail•com (Marek Vasut)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2] pxa2xx_spi: fix memory corruption
Date: Sun, 10 Jul 2011 14:43:41 +0200 [thread overview]
Message-ID: <201107101443.42307.marek.vasut@gmail.com> (raw)
In-Reply-To: <1310299762-20079-1-git-send-email-anarsoul@gmail.com>
On Sunday, July 10, 2011 02:09:22 PM Vasily Khoruzhick wrote:
> 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];
Ah, please don't name it starting with two underscores.
>
> /* 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);
Do you need that (u8 *) cast there ?
#define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a)))
from linux/kernel.h line 42
>
> drv_data->ioaddr = ssp->mmio_base;
> drv_data->ssdr_physical = ssp->phys_base + SSDR;
next prev parent reply other threads:[~2011-07-10 12:43 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
2011-07-10 7:57 ` Marek Vasut
2011-07-10 12:09 ` [PATCH v2] " Vasily Khoruzhick
2011-07-10 12:43 ` Marek Vasut [this message]
2011-07-10 13:09 ` Vasily Khoruzhick
2011-07-10 15:18 ` [PATCH v3] " Vasily Khoruzhick
2011-07-14 12:17 ` Vasily Khoruzhick
2011-07-14 12:21 ` Marek Vasut
2011-07-15 2:53 ` Grant Likely
2011-07-15 8:12 ` Russell King - ARM Linux
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
2011-11-29 14:05 ` Vasily Khoruzhick
2011-11-29 14:31 ` Marek Vasut
2011-12-07 20:35 ` Wolfram Sang
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=201107101443.42307.marek.vasut@gmail.com \
--to=marek.vasut@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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