diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-07 12:44:12 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 13:14:22 -0800 |
commit | 40edba667959559aa4385a5ec047420fcfeb5f03 (patch) | |
tree | 6df9fc6d71f5d7608a95ca7d437fca00b83afb1f /sound/core/oss/pcm_oss.c | |
parent | fb434cc26173c2285d48d640c639493bc6a6c5f5 (diff) | |
download | kernel_samsung_smdk4412-40edba667959559aa4385a5ec047420fcfeb5f03.zip kernel_samsung_smdk4412-40edba667959559aa4385a5ec047420fcfeb5f03.tar.gz kernel_samsung_smdk4412-40edba667959559aa4385a5ec047420fcfeb5f03.tar.bz2 |
ALSA: Add a reference counter to card instance
commit a0830dbd4e42b38aefdf3fb61ba5019a1a99ea85 upstream.
For more strict protection for wild disconnections, a refcount is
introduced to the card instance, and let it up/down when an object is
referred via snd_lookup_*() in the open ops.
The free-after-last-close check is also changed to check this refcount
instead of the empty list, too.
Reported-by: Matthieu CASTET <matthieu.castet@parrot.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core/oss/pcm_oss.c')
-rw-r--r-- | sound/core/oss/pcm_oss.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 23c34a0..ef6414b 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2457,6 +2457,8 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) __error2: snd_card_file_remove(pcm->card, file); __error1: + if (pcm) + snd_card_unref(pcm->card); return err; } |