opl3_oss use after free.
Don't read from free'd memory. Also make use of the return value, and don't register the device if something went wrong creating the port.
Coverity #955
sound/drivers/opl3/opl3_oss.c renamed from sound/drivers/opl3/opl3_oss.c~ +7 -5
@@ -104,8 +104,10 @@ static int snd_opl3_oss_create_port(stru voices, voices, name);if (opl3->oss_chset->port <0 ) { +int port; + port = opl3->oss_chset->port;snd_midi_channel_free_set (opl3->oss_chset); -return opl3->oss_chset->port; +return port; }return 0 ; }
@@ -136,10 +138,10 @@ void snd_opl3_init_seq_oss(struct snd_op arg->oper = oss_callback; arg->private_data = opl3; -snd_opl3_oss_create_port (opl3); - -/* register to OSS synth table */ -snd_device_register (opl3->card, dev); +if (snd_opl3_oss_create_port (opl3)) { +/* register to OSS synth table */ +snd_device_register (opl3->card, dev); + } }/* unregister */
Signature · 1 line
http://www.codemonkey.org.uk
Quoted 5 lines · Dave Jones
Don't read from free'd memory. Also make use of the return value, and don't register the device if something went wrong creating the port.
Coverity #955
identical bug in opl3_seq.c
This needs to check the return too, but I got lazy and just fixed the use-after-free.
Coverity #954
sound/drivers/opl3/opl3_seq.c renamed from sound/drivers/opl3/opl3_seq.c~ +3 -1
@@ -207,8 +207,10 @@ static int snd_opl3_synth_create_port(st16 , voices, name);if (opl3->chset->port <0 ) { +int port; + port = opl3->chset->port;snd_midi_channel_free_set (opl3->chset); -return opl3->chset->port; +return port; }return 0 ; }
Signature · 1 line
http://www.codemonkey.org.uk
At Mon, 6 Mar 2006 04:10:32 -0500,
Quoted 21 lines · Dave Jones
Quoted 5 lines · Dave Jones
Don't read from free'd memory. Also make use of the return value, and don't register the device if something went wrong creating the port.
Coverity #955
identical bug in
opl3_seq.c
This needs to check the return too, but I got lazy and just fixed the use-after-free.Coverity #954
Signed-off-by Dave Jones <[email protected]>sound/drivers/opl3/opl3_seq.c renamed from sound/drivers/opl3/opl3_seq.c~ +0
-0@@ -207,8 +207,10 @@ static int snd_opl3_synth_create_port(st 16, voices,
sound/drivers/opl3/opl3_seq.c static int snd_opl3_synth_create_port(st · line 216
Quoted 10 lines
sound/drivers/opl3/opl3_seq.c renamed from sound/drivers/opl3/opl3_seq.c~ +3
-1name);if (opl3->chset->port <0 ) { +int port; + port = opl3->chset->port;snd_midi_channel_free_set (opl3->chset); -return opl3->chset->port; +return port; }return 0 ; }
I gathered both and added the proper check of return value. Please check the below one.
Thanks.
---
[PATCH] Fix use after free in opl3_seq and opl3_oss
Don't read from free'd memory. Also make use of the return value, and don't register the device if something went wrong creating the port.
Coverity #954, #955
---
sound/drivers/opl3/opl3_oss.c +7 -5
@@ -104,8 +104,10 @@ static int snd_opl3_oss_create_port(stru voices, voices, name);if (opl3->oss_chset->port <0 ) { +int port; + port = opl3->oss_chset->port;snd_midi_channel_free_set (opl3->oss_chset); -return opl3->oss_chset->port; +return port; }return 0 ; }
@@ -136,10 +138,10 @@ void snd_opl3_init_seq_oss(struct snd_op arg->oper = oss_callback; arg->private_data = opl3; -snd_opl3_oss_create_port (opl3); - -/* register to OSS synth table */ -snd_device_register (opl3->card, dev); +if (snd_opl3_oss_create_port (opl3)) { +/* register to OSS synth table */ +snd_device_register (opl3->card, dev); + } }/* unregister */
sound/drivers/opl3/opl3_seq.c +9 -3
@@ -207,8 +207,10 @@ static int snd_opl3_synth_create_port(st16 , voices, name);if (opl3->chset->port <0 ) { +int port; + port = opl3->chset->port;snd_midi_channel_free_set (opl3->chset); -return opl3->chset->port; +return port; }return 0 ; }
@@ -218,7 +220,7 @@ static int snd_opl3_synth_create_port(ststatic int snd_opl3_seq_new_device (struct snd_seq_device *dev) {struct snd_opl3 *opl3; -int client; +int client, err;char name[32 ];int opl_ver;
@@ -239,7 +241,11 @@ static int snd_opl3_seq_new_device(strucif (client <0 )return client; -snd_opl3_synth_create_port (opl3); +if ((err =snd_opl3_synth_create_port (opl3)) <0 ) { +snd_seq_delete_kernel_client (client); + opl3->seq_client =-1 ; +return err; + }/* initialize instrument list */ opl3->ilist =snd_seq_instr_list_new ();