Skip to content

Commit 7826c69

Browse files
committed
ASoC: simple-card-utils: Don't use __free(device_node) at graph_util_parse_dai()
JIRA: https://issues.redhat.com/browse/RHEL-80682 CVE: CVE-2025-39930 commit de74ec7 Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Date: Fri Feb 28 00:29:30 2025 +0000 ASoC: simple-card-utils: Don't use __free(device_node) at graph_util_parse_dai() commit 419d191 ("ASoC: simple-card-utils: use __free(device_node) for device node") uses __free(device_node) for dlc->of_node, but we need to keep it while driver is in use. Don't use __free(device_node) in graph_util_parse_dai(). Fixes: 419d191 ("ASoC: simple-card-utils: use __free(device_node) for device node") Reported-by: Thuan Nguyen <thuan.nguyen-hong@banvien.com.vn> Reported-by: Detlev Casanova <detlev.casanova@collabora.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by: Thuan Nguyen <thuan.nguyen-hong@banvien.com.vn> Tested-by: Detlev Casanova <detlev.casanova@collabora.com> Link: https://patch.msgid.link/87eczisyhh.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
1 parent 5b37826 commit 7826c69

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

sound/soc/generic/simple-card-utils.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,14 +1079,15 @@ static int graph_get_dai_id(struct device_node *ep)
10791079
int graph_util_parse_dai(struct device *dev, struct device_node *ep,
10801080
struct snd_soc_dai_link_component *dlc, int *is_single_link)
10811081
{
1082+
struct device_node *node;
10821083
struct of_phandle_args args = {};
10831084
struct snd_soc_dai *dai;
10841085
int ret;
10851086

10861087
if (!ep)
10871088
return 0;
10881089

1089-
struct device_node *node __free(device_node) = of_graph_get_port_parent(ep);
1090+
node = of_graph_get_port_parent(ep);
10901091

10911092
/*
10921093
* Try to find from DAI node
@@ -1128,8 +1129,10 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
11281129
* if he unbinded CPU or Codec.
11291130
*/
11301131
ret = snd_soc_get_dlc(&args, dlc);
1131-
if (ret < 0)
1132+
if (ret < 0) {
1133+
of_node_put(node);
11321134
return ret;
1135+
}
11331136

11341137
parse_dai_end:
11351138
if (is_single_link)

0 commit comments

Comments
 (0)