From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Alex Dewar <alex.dewar90@gmail.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, <alsa-devel@alsa-project.org>, <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] ASoC: omap-mcbsp: Fix use of uninitialised pointer Date: Wed, 7 Oct 2020 15:05:42 +0300 [thread overview] Message-ID: <c2441186-c278-d84d-55c4-294ef01823a6@ti.com> (raw) In-Reply-To: <20201004102535.325547-1-alex.dewar90@gmail.com> On 04/10/2020 13.25, Alex Dewar wrote: > Commit 9c34d023dc35 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP > and Sidetone function split"), in rearranging various files, also replaced > calls to platform_get_resource_by_name() + devm_ioremap_resource() with a > single call to devm_platform_ioremap_resource_byname(). However, the > struct resource is needed as we access its members so at present a null > pointer is dereferenced. Fix by doing things the old way. > > Addresses-Coverity-ID: 1497530 ("Memory - illegal accesses") > Fixes: 9c34d023dc35 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split") it is fixing: 31e1fc4f11e2e ("ASoC: ti: omap-mcbsp: use devm_platform_ioremap_resource_byname") and we should just revert that commit. > Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> > --- > sound/soc/ti/omap-mcbsp.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c > index 186cea91076f..6025b30bbe77 100644 > --- a/sound/soc/ti/omap-mcbsp.c > +++ b/sound/soc/ti/omap-mcbsp.c > @@ -620,7 +620,11 @@ static int omap_mcbsp_init(struct platform_device *pdev) > spin_lock_init(&mcbsp->lock); > mcbsp->free = true; > > - mcbsp->io_base = devm_platform_ioremap_resource_byname(pdev, "mpu"); > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); > + if (!res) > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + > + mcbsp->io_base = devm_ioremap_resource(&pdev->dev, res); > if (IS_ERR(mcbsp->io_base)) > return PTR_ERR(mcbsp->io_base); > > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
prev parent reply other threads:[~2020-10-07 12:06 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-04 10:25 Alex Dewar 2020-10-06 15:21 ` Mark Brown 2020-10-07 12:05 ` Peter Ujfalusi [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=c2441186-c278-d84d-55c4-294ef01823a6@ti.com \ --to=peter.ujfalusi@ti.com \ --cc=alex.dewar90@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=jarkko.nikula@bitmer.com \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ --subject='Re: [PATCH] ASoC: omap-mcbsp: Fix use of uninitialised pointer' \ /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
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).