lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open()

Browse Source 
The error handling in snd_seq_oss_open() has several bad codes that
do dereferecing released pointers and double-free of kmalloc'ed data.
The object dp is release in free_devinfo() that is called via
private_free callback.  The rest shouldn't touch this object any more.

The patch changes delete_port() to call kfree() in any case, and gets
rid of unnecessary calls of destructors in snd_seq_oss_open().

Fixes CVE-2010-3080.

Reported-and-tested-by: Tavis Ormandy <taviso@cmpxchg8b.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2010-09-06 09:13:45 +02:00
parent e4ee8dd8af
commit 27f7ad5382
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sound/core/seq/oss/seq_oss_init.c
View File

@@ -281,13 +281,10 @@ snd_seq_oss_open(struct file *file, int level)
return 0; return 0;
_error: _error:
snd_seq_oss_writeq_delete(dp->writeq);
snd_seq_oss_readq_delete(dp->readq);
snd_seq_oss_synth_cleanup(dp); snd_seq_oss_synth_cleanup(dp);
snd_seq_oss_midi_cleanup(dp); snd_seq_oss_midi_cleanup(dp);
delete_port(dp);
delete_seq_queue(dp->queue); delete_seq_queue(dp->queue);
kfree(dp); delete_port(dp);
return rc; return rc;
} }
@@ -350,8 +347,10 @@ create_port(struct seq_oss_devinfo *dp)
static int static int
delete_port(struct seq_oss_devinfo *dp) delete_port(struct seq_oss_devinfo *dp)
{ {
if (dp->port < 0) if (dp->port < 0) {
kfree(dp);
return 0; return 0;
}
debug_printk(("delete_port %i\n", dp->port)); debug_printk(("delete_port %i\n", dp->port));
return snd_seq_event_port_detach(dp->cseq, dp->port); return snd_seq_event_port_detach(dp->cseq, dp->port);