[2.4] Memleak and incorrect return value in emu10k1 emu10k1_audio_open()

From: Oleg Drokin (green@linuxhacker.ru)
Date: Thu Mar 13 2003 - 14:13:42 EST


Hello!

   There is trivial memleak ion error exit path and incorrect value returned.
   Also seems it is not so bad idea to free allocated RAM before BUG(), too.
   See the patch.
   Found with help of smatch + enhanced unfree script.

Bye,
    Oleg

===== drivers/sound/emu10k1/audio.c 1.13 vs edited =====
--- 1.13/drivers/sound/emu10k1/audio.c Sun May 26 17:49:32 2002
+++ edited/drivers/sound/emu10k1/audio.c Thu Mar 13 22:10:39 2003
@@ -1135,7 +1135,8 @@
 
                 if ((wiinst = (struct wiinst *) kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) {
                         ERROR();
- return -ENODEV;
+ kfree(wave_dev);
+ return -ENOMEM;
                 }
 
                 wiinst->recsrc = card->wavein.recsrc;
@@ -1161,6 +1162,8 @@
                         wiinst->format.channels = hweight32(wiinst->fxwc);
                         break;
                 default:
+ kfree(wave_dev);
+ kfree(wiinst);
                         BUG();
                         break;
                 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Mar 15 2003 - 22:00:36 EST