openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] smscoreapi: memory leak fix 

Ensure release_firmware is called if kmalloc fails.

[mchehab@redhat.com: patch unmangled and converted from -p2 to -p1]
Signed-off-by: Roberto Alcantara <roberto@eletronica.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Roberto Alcântara 2013-05-21 16:32:30 -03:00 committed by Mauro Carvalho Chehab
parent 62d54876c5
commit 36b5114653
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/common/siano/smscoreapi.c
View File

@ -1173,15 +1173,16 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
if (!fw_buf) { if (!fw_buf) {
sms_err("failed to allocate firmware buffer"); sms_err("failed to allocate firmware buffer");
return -ENOMEM; rc = -ENOMEM;
} } else {
memcpy(fw_buf, fw->data, fw->size); memcpy(fw_buf, fw->data, fw->size);
fw_buf_size = fw->size; fw_buf_size = fw->size;
rc = (coredev->device_flags & SMS_DEVICE_FAMILY2) ? rc = (coredev->device_flags & SMS_DEVICE_FAMILY2) ?
smscore_load_firmware_family2(coredev, fw_buf, fw_buf_size) smscore_load_firmware_family2(coredev, fw_buf, fw_buf_size)
: loadfirmware_handler(coredev->context, fw_buf, : loadfirmware_handler(coredev->context, fw_buf,
fw_buf_size); fw_buf_size);
}
kfree(fw_buf); kfree(fw_buf);
release_firmware(fw); release_firmware(fw);