| Message ID | 1670228127-13835-1-git-send-email-wangyufen@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8ab2d12c726f0fde0692fa5d81d8019b3dcd62d0 |
| Headers | show |
| Series | ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link() | expand |
Hi > The of_get_next_child() returns a node with refcount incremented, and > decrements the refcount of prev. So in the error path of the while loop, > of_node_put() needs be called for cpu_ep. > > Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") > Signed-off-by: Wang Yufen <wangyufen@huawei.com> > --- Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > sound/soc/generic/audio-graph-card.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c > index fe7cf97..5daa824 100644 > --- a/sound/soc/generic/audio-graph-card.c > +++ b/sound/soc/generic/audio-graph-card.c > @@ -485,8 +485,10 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, > of_node_put(codec_ep); > of_node_put(codec_port); > > - if (ret < 0) > + if (ret < 0) { > + of_node_put(cpu_ep); > return ret; > + } > > codec_port_old = codec_port; > } > -- > 1.8.3.1 > > Thank you for your help !! Best regards --- Kuninori Morimoto
On Mon, 05 Dec 2022 16:15:27 +0800, Wang Yufen wrote: > The of_get_next_child() returns a node with refcount incremented, and > decrements the refcount of prev. So in the error path of the while loop, > of_node_put() needs be called for cpu_ep. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link() commit: 8ab2d12c726f0fde0692fa5d81d8019b3dcd62d0 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index fe7cf97..5daa824 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -485,8 +485,10 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, of_node_put(codec_ep); of_node_put(codec_port); - if (ret < 0) + if (ret < 0) { + of_node_put(cpu_ep); return ret; + } codec_port_old = codec_port; }
The of_get_next_child() returns a node with refcount incremented, and decrements the refcount of prev. So in the error path of the while loop, of_node_put() needs be called for cpu_ep. Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") Signed-off-by: Wang Yufen <wangyufen@huawei.com> --- sound/soc/generic/audio-graph-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)