diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-04-24 07:26:59 +0200 |
---|---|---|
committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-05-22 21:36:38 -0400 |
commit | fc2fc4694a85effc0fc920997241f20c0775eb9e (patch) | |
tree | caea5b2761e95ee6cb39243d8e18d96a6ce394a6 | |
parent | 13cc4cf41d6bd031b714b7fa5561d937533ff526 (diff) | |
download | linux-stable-fc2fc4694a85effc0fc920997241f20c0775eb9e.tar.gz |
ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
[ Upstream commit f5e94b4c6ebdabe0f602d796e0430180927521a0 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-rw-r--r-- | sound/core/seq/oss/seq_oss_synth.c | 12 |
1 files 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 f38cf91b4faf..e30a43efb2ad 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; |