From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753450Ab2L1L3w (ORCPT <rfc822;w@1wt.eu>);
	Fri, 28 Dec 2012 06:29:52 -0500
Received: from stargate.chelsio.com ([67.207.112.58]:10481 "EHLO
	stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752746Ab2L1L3t (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 28 Dec 2012 06:29:49 -0500
Message-ID: <50DD829A.1080503@chelsio.com>
Date: Fri, 28 Dec 2012 16:59:30 +0530
From: Naresh Kumar Inna <naresh@chelsio.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2
MIME-Version: 1.0
To: Jesper Juhl <jj@chaosbits.net>
CC: "James E.J. Bottomley" <JBottomley@parallels.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] [SCSI] csiostor: Don't leak mem or fail to release firmware
 in csio_hw_flash_config()
References: <alpine.LNX.2.00.1212262129490.23814@swampdragon.chaosbits.net>
In-Reply-To: <alpine.LNX.2.00.1212262129490.23814@swampdragon.chaosbits.net>
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7bit
X-Originating-IP: [10.193.191.187]
X-OriginalArrivalTime: 28 Dec 2012 11:29:35.0890 (UTC) FILETIME=[9D78C720:01CDE4EE]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <jj@chaosbits.net>
> ---
>  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 <naresh@chelsio.com>

Thanks,
Naresh.