summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-17 10:38:33 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-17 10:38:33 +0200
commit84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (patch)
tree6774218cb21d5ffbe704d6ad6beadc8559aaed1c /sound/core
parentMerge remote branch 'alsa/devel' into topic/misc (diff)
parentALSA: rawmidi: fix oops (use after free) when unloading a driver module (diff)
downloadlinux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.xz
linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/rawmidi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index a7868ad4d530..cbbed0db9e56 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -535,13 +535,15 @@ static int snd_rawmidi_release(struct inode *inode, struct file *file)
{
struct snd_rawmidi_file *rfile;
struct snd_rawmidi *rmidi;
+ struct module *module;
rfile = file->private_data;
rmidi = rfile->rmidi;
rawmidi_release_priv(rfile);
kfree(rfile);
+ module = rmidi->card->module;
snd_card_file_remove(rmidi->card, file);
- module_put(rmidi->card->module);
+ module_put(module);
return 0;
}