diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-04-24 08:26:59 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-10-21 10:45:42 +0300 |
| commit | 7e79f31fe781125ca370091d5aafb3abb222f8b8 (patch) | |
| tree | 448876be198acbc31ce004b5d5b8b211b804b51c | |
| parent | 9fbd4f88fbb01577fda99ed8307480e78a38be58 (diff) | |
| download | linux-7e79f31fe781125ca370091d5aafb3abb222f8b8.tar.xz | |
ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
commit f5e94b4c6ebdabe0f602d796e0430180927521a0 upstream.
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.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 ac3d7d2125e9..760b34092110 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; |