From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH 1/8] ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
Date: Tue, 24 Apr 2018 09:56:12 +0200 [thread overview]
Message-ID: <20180424075619.29602-2-tiwai@suse.de> (raw)
In-Reply-To: <20180424075619.29602-1-tiwai@suse.de>
When get_synthdev() is called for a MIDI device, it returns the fixed
midi_synth_dev without the use refcounting. OTOH, the caller is
supposed to unreference unconditionally after the usage, so this would
lead to unbalanced refcount.
This patch corrects the behavior and keep up the refcount balance also
for the MIDI synth device.
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/core/seq/oss/seq_oss_synth.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c
index cd0e0ebbfdb1..9e2b250ae780 100644
--- a/sound/core/seq/oss/seq_oss_synth.c
+++ b/sound/core/seq/oss/seq_oss_synth.c
@@ -363,10 +363,14 @@ get_synthdev(struct seq_oss_devinfo *dp, int dev)
return NULL;
if (! dp->synths[dev].opened)
return NULL;
- if (dp->synths[dev].is_midi)
- return &midi_synth_dev;
- if ((rec = get_sdev(dev)) == NULL)
- return NULL;
+ if (dp->synths[dev].is_midi) {
+ rec = &midi_synth_dev;
+ snd_use_lock_use(&rec->use_lock);
+ } else {
+ rec = get_sdev(dev);
+ if (!rec)
+ return NULL;
+ }
if (! rec->opened) {
snd_use_lock_free(&rec->use_lock);
return NULL;
--
2.16.3
next prev parent reply other threads:[~2018-04-24 7:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 7:56 [PATCH 0/8] ALSA: Hardening for potential Spectre v1 Takashi Iwai
2018-04-24 7:56 ` Takashi Iwai [this message]
2018-04-24 7:56 ` [PATCH 2/8] ALSA: seq: oss: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 3/8] ALSA: control: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 4/8] ALSA: hda: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 5/8] ALSA: opl3: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 6/8] ALSA: asihpi: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 7/8] ALSA: hdspm: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 8/8] ALSA: rme9652: " 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=20180424075619.29602-2-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=dan.carpenter@oracle.com \
/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