From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [PATCH lib 3/5] namehint: Fix bad free with invalid iface name
Date: Thu, 30 Apr 2015 15:06:16 +0200 [thread overview]
Message-ID: <1430399178-15173-4-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1430399178-15173-1-git-send-email-tiwai@suse.de>
Due to the uninitialized field before the error path, passing an
invalid iface argument may result in a bad free() call. Initialize
the fields properly beforehand.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
src/control/namehint.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/control/namehint.c b/src/control/namehint.c
index 6c04143a185c..b3e646eb10af 100644
--- a/src/control/namehint.c
+++ b/src/control/namehint.c
@@ -562,6 +562,8 @@ int snd_device_name_hint(int card, const char *iface, void ***hints)
list.list = NULL;
list.count = list.allocated = 0;
list.siface = iface;
+ list.show_all = 0;
+ list.cardname = NULL;
if (strcmp(iface, "card") == 0)
list.iface = SND_CTL_ELEM_IFACE_CARD;
else if (strcmp(iface, "pcm") == 0)
@@ -581,8 +583,6 @@ int snd_device_name_hint(int card, const char *iface, void ***hints)
goto __error;
}
- list.show_all = 0;
- list.cardname = NULL;
if (snd_config_search(local_config, "defaults.namehint.showall", &conf) >= 0)
list.show_all = snd_config_get_bool(conf) > 0;
if (card >= 0) {
--
2.3.6
next prev parent reply other threads:[~2015-04-30 13:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-30 13:06 [PATCH lib 0/5] alsa-lib namehint fixes Takashi Iwai
2015-04-30 13:06 ` [PATCH lib 1/5] namehint: Fix invalid list access in snd_device_name_hint() Takashi Iwai
2015-04-30 13:06 ` [PATCH lib 2/5] namehint: Fix the listing without device number Takashi Iwai
2015-04-30 13:06 ` Takashi Iwai [this message]
2015-04-30 13:06 ` [PATCH lib 4/5] Allow hint for ctl, hwdep, timer and seq Takashi Iwai
2015-04-30 13:06 ` [PATCH lib 5/5] conf: Add hint descriptions to ctl, hwdep, seq and timer devices Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430399178-15173-4-git-send-email-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox