redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: ux500: mop500: Fix some refcounted resources issues 

[ Upstream commit 4e8748fcae ]

There are 2 issues here:
   - if one of the 'of_parse_phandle' fails, calling 'mop500_of_node_put()'
     is a no-op because the 'mop500_dai_links' structure has not been
     initialized yet, so the referenced are not decremented
   - The reference stored in 'mop500_dai_links[i].codecs' is refcounted
     only once in the probe and must be decremented only once.

Fixes: 39013bd60e ("ASoC: Ux500: Dispose of device nodes correctly")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20200512100705.246349-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Christophe JAILLET 2020-05-12 12:07:05 +02:00 committed by Greg Kroah-Hartman
parent b0ccdd2fdd
commit 5acfef9964
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/ux500/mop500.c
View File

@ -63,10 +63,11 @@ static void mop500_of_node_put(void)
{
int i;
for (i = 0; i < 2; i++) {
for (i = 0; i < 2; i++)
of_node_put(mop500_dai_links[i].cpus->of_node);
of_node_put(mop500_dai_links[i].codecs->of_node);
}
/* Both links use the same codec, which is refcounted only once */
of_node_put(mop500_dai_links[0].codecs->of_node);
}
static int mop500_of_probe(struct platform_device *pdev,
@ -81,7 +82,9 @@ static int mop500_of_probe(struct platform_device *pdev,
if (!(msp_np[0] && msp_np[1] && codec_np)) {
dev_err(&pdev->dev, "Phandle missing or invalid\n");
mop500_of_node_put();
for (i = 0; i < 2; i++)
of_node_put(msp_np[i]);
of_node_put(codec_np);
return -EINVAL;
}