* [PATCH] ALSA: hda/senary: Fix potential resource leak in set_beep_amp
@ 2025-11-06 3:18 wangdich9700
0 siblings, 0 replies; 3+ messages in thread
From: wangdich9700 @ 2025-11-06 3:18 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, cezary.rojewski
Cc: linux-kernel, alsa-devel, linux-arm-kernel, wangdicheng,
wangdicheng
From: wangdicheng <wangdich9700@163.com>
Add proper error handling in set_beep_amp function to avoid potential
resource leaks when snd_hda_gen_add_kctl fails.
Signed-off-by: wangdicheng <wangdicheng@kylinos.cn>
---
sound/hda/codecs/senarytech.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sound/hda/codecs/senarytech.c b/sound/hda/codecs/senarytech.c
index 9aa1e9bcd9ec..99af8d5e51db 100644
--- a/sound/hda/codecs/senarytech.c
+++ b/sound/hda/codecs/senarytech.c
@@ -47,17 +47,28 @@ static int set_beep_amp(struct senary_spec *spec, hda_nid_t nid,
{
struct snd_kcontrol_new *knew;
unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
- int i;
+ int i, err;
spec->gen.beep_nid = nid;
for (i = 0; i < ARRAY_SIZE(senary_beep_mixer); i++) {
knew = snd_hda_gen_add_kctl(&spec->gen, NULL,
&senary_beep_mixer[i]);
- if (!knew)
- return -ENOMEM;
+ if (!knew) {
+ err = -ENOMEM;
+ goto error;
+ }
knew->private_value = beep_amp;
}
return 0;
+
+error:
+ /* Clean up any successfully added controls */
+ while (i-- > 0) {
+ /* The gen spec will be cleaned up in senary_remove,
+ * so we don't need individual cleanup here
+ */
+ }
+ return err;
}
static int senary_auto_parse_beep(struct hda_codec *codec)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ALSA: hda/senary: Fix potential resource leak in set_beep_amp
@ 2025-11-06 6:35 wangdich9700
2025-11-06 10:06 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: wangdich9700 @ 2025-11-06 6:35 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai
Cc: linux-kernel, linux-sound, linux-arm-kernel, wangdicheng,
wangdicheng
From: wangdicheng <wangdich9700@163.com>
Add proper error handling in set_beep_amp function to avoid potential
resource leaks when snd_hda_gen_add_kctl fails.
Signed-off-by: wangdicheng <wangdicheng@kylinos.cn>
---
sound/hda/codecs/senarytech.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sound/hda/codecs/senarytech.c b/sound/hda/codecs/senarytech.c
index 9aa1e9bcd9ec..99af8d5e51db 100644
--- a/sound/hda/codecs/senarytech.c
+++ b/sound/hda/codecs/senarytech.c
@@ -47,17 +47,28 @@ static int set_beep_amp(struct senary_spec *spec, hda_nid_t nid,
{
struct snd_kcontrol_new *knew;
unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
- int i;
+ int i, err;
spec->gen.beep_nid = nid;
for (i = 0; i < ARRAY_SIZE(senary_beep_mixer); i++) {
knew = snd_hda_gen_add_kctl(&spec->gen, NULL,
&senary_beep_mixer[i]);
- if (!knew)
- return -ENOMEM;
+ if (!knew) {
+ err = -ENOMEM;
+ goto error;
+ }
knew->private_value = beep_amp;
}
return 0;
+
+error:
+ /* Clean up any successfully added controls */
+ while (i-- > 0) {
+ /* The gen spec will be cleaned up in senary_remove,
+ * so we don't need individual cleanup here
+ */
+ }
+ return err;
}
static int senary_auto_parse_beep(struct hda_codec *codec)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: hda/senary: Fix potential resource leak in set_beep_amp
2025-11-06 6:35 [PATCH] ALSA: hda/senary: Fix potential resource leak in set_beep_amp wangdich9700
@ 2025-11-06 10:06 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2025-11-06 10:06 UTC (permalink / raw)
To: wangdich9700
Cc: lgirdwood, broonie, perex, tiwai, linux-kernel, linux-sound,
linux-arm-kernel, wangdicheng
On Thu, 06 Nov 2025 07:35:46 +0100,
wangdich9700@163.com wrote:
>
> From: wangdicheng <wangdich9700@163.com>
>
> Add proper error handling in set_beep_amp function to avoid potential
> resource leaks when snd_hda_gen_add_kctl fails.
>
> Signed-off-by: wangdicheng <wangdicheng@kylinos.cn>
Please align both From and Signed-off-by addresses.
And in this patch...
> ---
> sound/hda/codecs/senarytech.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/sound/hda/codecs/senarytech.c b/sound/hda/codecs/senarytech.c
> index 9aa1e9bcd9ec..99af8d5e51db 100644
> --- a/sound/hda/codecs/senarytech.c
> +++ b/sound/hda/codecs/senarytech.c
> @@ -47,17 +47,28 @@ static int set_beep_amp(struct senary_spec *spec, hda_nid_t nid,
> {
> struct snd_kcontrol_new *knew;
> unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
> - int i;
> + int i, err;
>
> spec->gen.beep_nid = nid;
> for (i = 0; i < ARRAY_SIZE(senary_beep_mixer); i++) {
> knew = snd_hda_gen_add_kctl(&spec->gen, NULL,
> &senary_beep_mixer[i]);
> - if (!knew)
> - return -ENOMEM;
> + if (!knew) {
> + err = -ENOMEM;
> + goto error;
> + }
> knew->private_value = beep_amp;
> }
> return 0;
> +
> +error:
> + /* Clean up any successfully added controls */
> + while (i-- > 0) {
> + /* The gen spec will be cleaned up in senary_remove,
> + * so we don't need individual cleanup here
> + */
> + }
> + return err;
> }
So the "error handling" you added is just an empty loop.
What really does this patch "fix"?
As of this, it looks like just adding some garbage.
thanks,
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-11-06 10:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-06 6:35 [PATCH] ALSA: hda/senary: Fix potential resource leak in set_beep_amp wangdich9700
2025-11-06 10:06 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2025-11-06 3:18 wangdich9700
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).