Commit 8afe9119 authored Jul 13, 2011 by Jesper Juhl Committed by Mauro Carvalho Chehab Jul 27, 2011

[media] media, Micronas dvb-t: Fix mem leaks, don't needlessly zero mem, fix spelling



In drivers/media/dvb/frontends/drxd_hard.c::load_firmware() I see 3
small issues:

 1) When the 'fw' variable goes out of scope we'll leak the memory
 allocated to it by request_firmware() by neglecting to call
 release_firmware().

 2) After a successful request_firmware() we allocate fw->size bytes
 of memory using kzalloc() only to immediately overwrite all that
 memory with memcpy(), so asking for zeroed memory seems like wasted
 effort - just use kmalloc().

 3) In one of the error messages "no memory" lacks a space and is
 written as "nomemory".

This patch fixes all 3 issues.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 9b67693c

drivers/media/dvb/frontends/drxd_hard.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -909,14 +909,16 @@ static int load_firmware(struct drxd_state state, const char fw_name)
		return -EIO;
		}

		state->microcode = kzalloc(fw->size, GFP_KERNEL);
		state->microcode = kmalloc(fw->size, GFP_KERNEL);
		if (state->microcode == NULL) {
		release_firmware(fw);
		printk(KERN_ERR "drxd: firmware load failure: no memory\n");
		return -ENOMEM;
		}

		memcpy(state->microcode, fw->data, fw->size);
		state->microcode_length = fw->size;
		release_firmware(fw);
		return 0;
		}