Re: [PATCH] [SCSI] csiostor: Don't leak mem or fail to release firmware in csio_hw_flash_config()

[Naresh Kumar Inna]

On 12/27/2012 2:01 AM, Jesper Juhl wrote:
> If kzalloc() or csio_hw_check_fwconfig() fail we may leave the
> csio_hw_flash_config() function without freeing allocated memory or
> firmware. This should take care of the leaks.
> 
> Signed-off-by: Jesper Juhl 
> ---
>  drivers/scsi/csiostor/csio_hw.c |   15 +--
>  1 files changed, 9 insertions(+), 6 deletions(-)
> 
>  Note: I'm unable to really test this, so the patch is compile tested
>only.
> 
> diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
> index 8ecdb94..bdd78fb 100644
> --- a/drivers/scsi/csiostor/csio_hw.c
> +++ b/drivers/scsi/csiostor/csio_hw.c
> @@ -2131,13 +2131,16 @@ csio_hw_flash_config(struct csio_hw *hw, u32 
> *fw_cfg_param, char *path)
>   value_to_add = 4 - (cf->size % 4);
>  
>   cfg_data = kzalloc(cf->size+value_to_add, GFP_KERNEL);
> - if (cfg_data == NULL)
> - return -ENOMEM;
> + if (cfg_data == NULL) {
> + ret = -ENOMEM;
> + goto leave;
> + }
>  
>   memcpy((void *)cfg_data, (const void *)cf->data, cf->size);
> -
> - if (csio_hw_check_fwconfig(hw, fw_cfg_param) != 0)
> - return -EINVAL;
> + if (csio_hw_check_fwconfig(hw, fw_cfg_param) != 0) {
> + ret = -EINVAL;
> + goto leave;
> + }
>  
>   mtype = FW_PARAMS_PARAM_Y_GET(*fw_cfg_param);
>   maddr = FW_PARAMS_PARAM_Z_GET(*fw_cfg_param) << 16;
> @@ -2149,9 +2152,9 @@ csio_hw_flash_config(struct csio_hw *hw, u32 
> *fw_cfg_param, char *path)
>   strncpy(path, "/lib/firmware/" CSIO_CF_FNAME, 64);
>   }
>  
> +leave:
>   kfree(cfg_data);
>   release_firmware(cf);
> -
>   return ret;
>  }
>  
> 

Acked-by: Naresh Kumar Inna 

Thanks,
Naresh.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] [SCSI] csiostor: Don't leak mem or fail to release firmware in csio_hw_flash_config()

[Jesper Juhl]

If kzalloc() or csio_hw_check_fwconfig() fail we may leave the
csio_hw_flash_config() function without freeing allocated memory or
firmware. This should take care of the leaks.

Signed-off-by: Jesper Juhl 
---
 drivers/scsi/csiostor/csio_hw.c |   15 +--
 1 files changed, 9 insertions(+), 6 deletions(-)

 Note: I'm unable to really test this, so the patch is compile tested
   only.

diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 8ecdb94..bdd78fb 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -2131,13 +2131,16 @@ csio_hw_flash_config(struct csio_hw *hw, u32 
*fw_cfg_param, char *path)
value_to_add = 4 - (cf->size % 4);
 
cfg_data = kzalloc(cf->size+value_to_add, GFP_KERNEL);
-   if (cfg_data == NULL)
-   return -ENOMEM;
+   if (cfg_data == NULL) {
+   ret = -ENOMEM;
+   goto leave;
+   }
 
memcpy((void *)cfg_data, (const void *)cf->data, cf->size);
-
-   if (csio_hw_check_fwconfig(hw, fw_cfg_param) != 0)
-   return -EINVAL;
+   if (csio_hw_check_fwconfig(hw, fw_cfg_param) != 0) {
+   ret = -EINVAL;
+   goto leave;
+   }
 
mtype = FW_PARAMS_PARAM_Y_GET(*fw_cfg_param);
maddr = FW_PARAMS_PARAM_Z_GET(*fw_cfg_param) << 16;
@@ -2149,9 +2152,9 @@ csio_hw_flash_config(struct csio_hw *hw, u32 
*fw_cfg_param, char *path)
strncpy(path, "/lib/firmware/" CSIO_CF_FNAME, 64);
}
 
+leave:
kfree(cfg_data);
release_firmware(cf);
-
return ret;
 }
 
-- 
1.7.1


-- 
Jesper Juhlhttp://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html