[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170903152731.GA27302@udknight>
Date: Sun, 3 Sep 2017 23:27:32 +0800
From: Wang YanQing <udknight@...il.com>
To: tiwai@...e.de
Cc: alsa-devel@...a-project.org, linux-kernel@...r.kernel.org
Subject: [PATCH] ALSA: hda: Fix resource leak issue in
snd_hda_codec_build_controls and snd_hda_codec_parse_pcms
When patch_ops.init, patch_ops.build_pcms and patch_ops.build_controls
return failure, we need to free resource with patch_ops.free, or we will
get resource leak.
Signed-off-by: Wang YanQing <udknight@...il.com>
---
sound/pci/hda/hda_codec.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index df6b57e..4e3e613 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2973,8 +2973,11 @@ int snd_hda_codec_build_controls(struct hda_codec *codec)
err = codec->patch_ops.init(codec);
if (!err && codec->patch_ops.build_controls)
err = codec->patch_ops.build_controls(codec);
- if (err < 0)
+ if (err < 0) {
+ if (codec->patch_ops.free)
+ codec->patch_ops.free(codec);
return err;
+ }
/* we create chmaps here instead of build_pcms */
err = add_std_chmaps(codec);
@@ -3170,6 +3173,8 @@ int snd_hda_codec_parse_pcms(struct hda_codec *codec)
if (err < 0) {
codec_err(codec, "cannot build PCMs for #%d (error %d)\n",
codec->core.addr, err);
+ if (codec->patch_ops.free)
+ codec->patch_ops.free(codec);
return err;
}
--
1.8.5.6.2.g3d8a54e.dirty
Powered by blists - more mailing lists