From: viresh kumar <viresh.kumar@linaro.org>
To: Jon Mason <jon.mason@intel.com>, Dan Williams <djbw@fb.com>
Cc: linux-kernel@vger.kernel.org, Dave Jiang <dave.jiang@intel.com>,
Vinod Koul <vinod.koul@intel.com>
Subject: Re: [PATCH] dmatest: Fix NULL pointer dereference on ioat
Date: Sat, 10 Nov 2012 09:00:15 +0530 [thread overview]
Message-ID: <CAOh2x=mE8d1YtRy_Efqbtc+24SCgEYuKwVpFHrFZBTpt2CB08w@mail.gmail.com> (raw)
In-Reply-To: <1352494660-6650-1-git-send-email-jon.mason@intel.com>
On Sat, Nov 10, 2012 at 2:27 AM, Jon Mason <jon.mason@intel.com> wrote:
> device_control is an optional and not implemented in all DMA drivers.
> Any calls to these will result in a NULL pointer dereference. dmatest
> makes two of these calls when completing the kernel thread and removing
> the module. These are corrected by calling the dmaengine_device_control
> wrapper and checking for a non-existant device_control function pointer
> there.
>
> Signed-off-by: Jon Mason <jon.mason@intel.com>
> CC: Vinod Koul <vinod.koul@intel.com>
> CC: Dan Williams <djbw@fb.com>
> ---
> drivers/dma/dmatest.c | 4 ++--
> include/linux/dmaengine.h | 5 ++++-
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
> index d3201e4..e0004fb 100644
> --- a/include/linux/dmaengine.h
> +++ b/include/linux/dmaengine.h
> @@ -608,7 +608,10 @@ static inline int dmaengine_device_control(struct dma_chan *chan,
> enum dma_ctrl_cmd cmd,
> unsigned long arg)
> {
> - return chan->device->device_control(chan, cmd, arg);
> + if (chan->device->device_control)
> + return chan->device->device_control(chan, cmd, arg);
> + else
> + return -EINVAL;
-ENOTSUPP or -ENOSYS ??
@Dan: I believe i don't have to send another version now. Correct??
--
viresh
next prev parent reply other threads:[~2012-11-10 3:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 20:57 [PATCH] dmatest: Fix NULL pointer dereference on ioat Jon Mason
2012-11-10 3:30 ` viresh kumar [this message]
2012-11-11 22:09 ` Jon Mason
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='CAOh2x=mE8d1YtRy_Efqbtc+24SCgEYuKwVpFHrFZBTpt2CB08w@mail.gmail.com' \
--to=viresh.kumar@linaro.org \
--cc=dave.jiang@intel.com \
--cc=djbw@fb.com \
--cc=jon.mason@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
/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).