| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 18 Oct 2011 05:45:54 +0200
From: Julia Lawall <julia@...u.dk>
To: Liam Girdwood <lrg@...com>
Cc: kernel-janitors@...r.kernel.org,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.de>,
Manuel Lauss <manuel.lauss@...glemail.com>,
Ralf Baechle <ralf@...ux-mips.org>,
alsa-devel@...a-project.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2/3] sound/soc/au1x: keep pointer to resource so it can be freed
From: Julia Lawall <julia@...u.dk>
Add a new variable for storing resources accessed subsequent to the one
accessed using request_mem_region, so the one accessed using
request_mem_region can be released if needed.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r@
expression E, E1;
identifier f;
statement S1,S2,S3;
@@
if (E == NULL)
{
... when != if (E == NULL || ...) S1 else S2
when != E = E1
*E->f
... when any
return ...;
}
else S3
// </smpl>
Signed-off-by: Julia Lawall <julia@...u.dk>
---
sound/soc/au1x/psc-ac97.c | 14 +++++++-------
sound/soc/au1x/psc-i2s.c | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index 172eefd..62e5640 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -364,7 +364,7 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = {
static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
{
int ret;
- struct resource *r;
+ struct resource *r, *r1;
unsigned long sel;
struct au1xpsc_audio_data *wd;
@@ -388,15 +388,15 @@ static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
if (!wd->mmio)
goto out1;
- r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
- if (!r)
+ r1 = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+ if (!r1)
goto out2;
- wd->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = r->start;
+ wd->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = r1->start;
- r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
- if (!r)
+ r1 = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+ if (!r1)
goto out2;
- wd->dmaids[SNDRV_PCM_STREAM_CAPTURE] = r->start;
+ wd->dmaids[SNDRV_PCM_STREAM_CAPTURE] = r1->start;
/* configuration: max dma trigger threshold, enable ac97 */
wd->cfg = PSC_AC97CFG_RT_FIFO8 | PSC_AC97CFG_TT_FIFO8 |
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index 7c5ae92..621e260 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -290,7 +290,7 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = {
static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev)
{
- struct resource *r;
+ struct resource *r, *r1;
unsigned long sel;
int ret;
struct au1xpsc_audio_data *wd;
@@ -313,15 +313,15 @@ static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev)
if (!wd->mmio)
goto out1;
- r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
- if (!r)
+ r1 = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+ if (!r1)
goto out2;
- wd->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = r->start;
+ wd->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = r1->start;
- r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
- if (!r)
+ r1 = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+ if (!r1)
goto out2;
- wd->dmaids[SNDRV_PCM_STREAM_CAPTURE] = r->start;
+ wd->dmaids[SNDRV_PCM_STREAM_CAPTURE] = r1->start;
/* preserve PSC clock source set up by platform (dev.platform_data
* is already occupied by soc layer)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists