RE: [PATCH] SCSI, Brocade FC HBA: Remember to alwaysrelease_firmware() so we don't leak memory.

[Jing Huang]

Thanks for fixing the issue. The patch looks good to me.

Acked-by: Jing Huang <huangj@xxxxxxxxxxx>

>-----Original Message-----
>From: Jesper Juhl [mailto:jj@xxxxxxxxxxxxx]
>Sent: Wednesday, January 12, 2011 2:10 PM
>To: linux-kernel@xxxxxxxxxxxxxxx
>Cc: linux-scsi@xxxxxxxxxxxxxxx; James E.J. Bottomley; Jing Huang
>Subject: [PATCH] SCSI, Brocade FC HBA: Remember to always release_firmware()
>so we don't leak memory.
>
>Once we've called request_firmware() we must remember to call
>release_firmware() to free memory. We don't currently do this in
>bfad_read_firmware(); causing a memory leak.
>
>Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
>---
> bfad.c |   11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
>  Compile tested only.
>
>diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
>index 44524cf..d7bafeb 100644
>--- a/drivers/scsi/bfa/bfad.c
>+++ b/drivers/scsi/bfa/bfad.c
>@@ -1558,23 +1558,22 @@ bfad_read_firmware(struct pci_dev *pdev, u32
>**bfi_image,
>
> 	if (request_firmware(&fw, fw_name, &pdev->dev)) {
> 		printk(KERN_ALERT "Can't locate firmware %s\n", fw_name);
>-		goto error;
>+		*bfi_image = NULL;
>+		goto out;
> 	}
>
> 	*bfi_image = vmalloc(fw->size);
> 	if (NULL == *bfi_image) {
> 		printk(KERN_ALERT "Fail to allocate buffer for fw image "
> 			"size=%x!\n", (u32) fw->size);
>-		goto error;
>+		goto out;
> 	}
>
> 	memcpy(*bfi_image, fw->data, fw->size);
> 	*bfi_image_size = fw->size/sizeof(u32);
>-
>+out:
>+	release_firmware(fw);
> 	return *bfi_image;
>-
>-error:
>-	return NULL;
> }
>
> u32 *
>
>
>--
>Jesper Juhl <jj@xxxxxxxxxxxxx>            http://www.chaosbits.net/
>Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
>Plain text mails only, please.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/