diff options
| author |   Matt Porter <mporter@ti.com> | 2013-03-05 10:58:22 -0500 |
|---|---|---|
| committer |   Sekhar Nori <nsekhar@ti.com> | 2013-03-12 17:10:46 +0530 |
| commit | 069552777a121eb39da29de4bc0383483dbe1f7e (patch) | |
| tree | 8aa718d095cfb091ce64036e6efa822d6ec00e03 /arch/arm/mach-davinci/dma.c | |
| parent | Linux 3.9-rc1 (diff) | |
| download | linux-dev-069552777a121eb39da29de4bc0383483dbe1f7e.tar.xz linux-dev-069552777a121eb39da29de4bc0383483dbe1f7e.zip | |
ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830
This adds additional error checking to the private edma api implementation
to catch the case where the edma_alloc_slot() has an invalid controller
parameter. The edma dmaengine wrapper driver relies on this condition
being handled in order to avoid setting up a second edma dmaengine
instance on DA830.
Verfied using a DA850 with the second EDMA controller platform instance
removed to simulate a DA830 which only has a single EDMA controller.
Reported-by: Tomas Novotny <tomas@novotny.cz>
Signed-off-by: Matt Porter <mporter@ti.com>
Cc: stable@vger.kernel.org # v3.7.x+
Tested-by: Tomas Novotny <tomas@novotny.cz>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/dma.c')
| -rw-r--r-- | arch/arm/mach-davinci/dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index a685e9706b7b..45b7c71d9cc1 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -743,6 +743,9 @@ EXPORT_SYMBOL(edma_free_channel); */ int edma_alloc_slot(unsigned ctlr, int slot) { + if (!edma_cc[ctlr]) + return -EINVAL; + if (slot >= 0) slot = EDMA_CHAN_SLOT(slot); |