[media] media, Micronas dvb-t: Fix mem leaks, don't needlessly zero mem, fix spelling
authorJesper Juhl <jj@chaosbits.net>
Wed, 13 Jul 2011 20:58:13 +0000 (17:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:55:56 +0000 (17:55 -0300)
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>
drivers/media/dvb/frontends/drxd_hard.c

index d7afa3493f1e47ac6c865fcda56fe9e72c451ee2..2238bf0be95936320feccbfc65f30c1503167e08 100644 (file)
@@ -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) {
-               printk(KERN_ERR "drxd: firmware load failure: nomemory\n");
+               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;
 }