From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Colin King <colin.king@canonical.com>,
Vinod Koul <vkoul@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
Tony Lindgren <tony@atomide.com>, <dmaengine@vger.kernel.org>
Cc: <kernel-janitors@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH][next][V2] dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferenced
Date: Thu, 9 Jan 2020 17:33:07 +0200 [thread overview]
Message-ID: <7e396a66-41d0-ace8-41b5-1018e6d9d095@ti.com> (raw)
In-Reply-To: <20200109131953.157154-1-colin.king@canonical.com>
Colin,
On 09/01/2020 15.19, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently when the call to dev_get_platdata returns null the driver issues
> a warning and then later dereferences the null pointer. Avoid this issue
> by returning -ENODEV errror rather when the platform data is null and
> change the warning to an appropriate error message.
Thank you for the update!
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Addresses-Coverity: ("Dereference after null check")
> Fixes: 211010aeb097 ("dmaengine: ti: omap-dma: Pass sdma auxdata to driver and use it")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>
> V2: return -ENODEV and change warning to an error message as suggested by
> Peter Ujfalusi.
> ---
> drivers/dma/ti/omap-dma.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
> index fc8f7b2fc7b3..a93515015dce 100644
> --- a/drivers/dma/ti/omap-dma.c
> +++ b/drivers/dma/ti/omap-dma.c
> @@ -1658,8 +1658,10 @@ static int omap_dma_probe(struct platform_device *pdev)
> if (conf) {
> od->cfg = conf;
> od->plat = dev_get_platdata(&pdev->dev);
> - if (!od->plat)
> - dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
> + if (!od->plat) {
> + dev_err(&pdev->dev, "omap_system_dma_plat_info is missing");
> + return -ENODEV;
> + }
> } else {
> od->cfg = &default_cfg;
>
>
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next prev parent reply other threads:[~2020-01-09 15:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 13:19 [PATCH][next][V2] dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferenced Colin King
2020-01-09 15:33 ` Peter Ujfalusi [this message]
2020-01-10 7:46 ` Vinod Koul
2020-01-10 9:21 ` Colin Ian King
2020-01-13 17:46 ` Tony Lindgren
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=7e396a66-41d0-ace8-41b5-1018e6d9d095@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=colin.king@canonical.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony@atomide.com \
--cc=vkoul@kernel.org \
/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).