Commit 8afe9119 authored by Jesper Juhl's avatar Jesper Juhl Committed by Mauro Carvalho Chehab

[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: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9b67693c
...@@ -909,14 +909,16 @@ static int load_firmware(struct drxd_state *state, const char *fw_name) ...@@ -909,14 +909,16 @@ static int load_firmware(struct drxd_state *state, const char *fw_name)
return -EIO; return -EIO;
} }
state->microcode = kzalloc(fw->size, GFP_KERNEL); state->microcode = kmalloc(fw->size, GFP_KERNEL);
if (state->microcode == NULL) { if (state->microcode == NULL) {
printk(KERN_ERR "drxd: firmware load failure: nomemory\n"); release_firmware(fw);
printk(KERN_ERR "drxd: firmware load failure: no memory\n");
return -ENOMEM; return -ENOMEM;
} }
memcpy(state->microcode, fw->data, fw->size); memcpy(state->microcode, fw->data, fw->size);
state->microcode_length = fw->size; state->microcode_length = fw->size;
release_firmware(fw);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment