Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda44e1d authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] OSS: Fix leak in awe_wave, also remove pointless cast. 



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

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96a9b4d3

sound/oss/awe_wave.c

+4 −2
Original line number Diff line number Diff line
@@ -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 *addr, int offs, int size, int pmgr_flag) 
	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);