From: nsekhar@ti•com (Sekhar Nori)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2] arm: davinci: fix edma dmaengine induced null pointer dereference on da830
Date: Tue, 12 Mar 2013 15:45:35 +0530 [thread overview]
Message-ID: <513F0047.9070303@ti.com> (raw)
In-Reply-To: <20130306175753.14f74f31@pcnovotny-t.fit.vutbr.cz>
On 3/6/2013 10:27 PM, Tomas Novotny wrote:
> On Tue, 5 Mar 2013 10:58:22 -0500
> Matt Porter <mporter@ti•com> wrote:
>
>> 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 at vger.kernel.org # v3.7.x+
>> ---
>> v2: Move error check out of conditional to catch all cases
>>
>> arch/arm/mach-davinci/dma.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
>> index a685e97..45b7c71 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);
>>
>
> On the TI AM1707 based custom board:
>
> Tested-by: Tomas Novotny <tomas@novotny•cz>
I tested it on DA830 EVM. Queuing this for v3.9-rc
Thanks,
Sekhar
prev parent reply other threads:[~2013-03-12 10:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 15:58 [PATCH v2] arm: davinci: fix edma dmaengine induced null pointer dereference on da830 Matt Porter
2013-03-06 16:57 ` Tomas Novotny
2013-03-12 10:15 ` Sekhar Nori [this message]
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=513F0047.9070303@ti.com \
--to=nsekhar@ti$(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