[PATCH] ALSA: hda/senary: Fix potential resource leak in set_beep_amp
wangdich9700 at 163.com
wangdich9700 at 163.com
Wed Nov 5 22:35:46 PST 2025
From: wangdicheng <wangdich9700 at 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 at 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
More information about the linux-arm-kernel
mailing list