diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-04-24 07:26:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-04-25 10:37:45 +0200 |
| commit | f5e94b4c6ebdabe0f602d796e0430180927521a0 (patch) | |
| tree | bfdc7a9bfc66c8711e52772e5762aed1efec9484 | |
| parent | ab3b8e5159b5335c81ba2d09ee5054d4a1b5a7a6 (diff) | |
| download | linux-f5e94b4c6ebdabe0f602d796e0430180927521a0.tar.gz linux-f5e94b4c6ebdabe0f602d796e0430180927521a0.tar.bz2 linux-f5e94b4c6ebdabe0f602d796e0430180927521a0.zip | |
ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
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>
| -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 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; |