mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] OSS: Fix leak in awe_wave, also remove pointless cast.
@ 2006-03-18 22:43 Jesper Juhl
  0 siblings, 0 replies; only message in thread
From: Jesper Juhl @ 2006-03-18 22:43 UTC (permalink / raw)
  To: linux-kernel; +Cc: Takashi Iwai, Jesper Juhl


Fix resource leak and remove pointless cast of kmalloc return value.


Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
---

 sound/oss/awe_wave.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- linux-2.6.16-rc6-orig/sound/oss/awe_wave.c	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.16-rc6/sound/oss/awe_wave.c	2006-03-18 23:39:19.000000000 +0100
@@ -2944,7 +2944,7 @@ alloc_new_info(void)
 {
 	awe_voice_list *newlist;
 	
-	newlist = (awe_voice_list *)kmalloc(sizeof(*newlist), GFP_KERNEL);
+	newlist = kmalloc(sizeof(*newlist), GFP_KERNEL);
 	if (newlist == NULL) {
 		printk(KERN_ERR "AWE32: can't alloc info table\n");
 		return NULL;
@@ -3547,8 +3547,10 @@ awe_load_guspatch(const char __user *add
 	smp->checksum_flag = 0;
 	smp->checksum = 0;
 
-	if ((rc = awe_write_wave_data(addr, sizeof_patch, smprec, -1)) < 0)
+	if ((rc = awe_write_wave_data(addr, sizeof_patch, smprec, -1)) < 0) {
+		kfree(vrec);
 		return rc;
+	}
 	sf->mem_ptr += rc;
 	add_sf_sample(sf, smprec);
 




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2006-03-18 22:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-03-18 22:43 [PATCH] OSS: Fix leak in awe_wave, also remove pointless cast Jesper Juhl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®