Re: [PATCH] mfd: cros_ec: Fix possible leak in led_rgb_store()

[Lee Jones <lee.jones@linaro.org>]

On Sun, 19 Jul 2015, Christian Engelmayer wrote:

> Function led_rgb_store() contains some direct returns in error cases that
> leak the already allocated cros_ec_command message structure. Make sure
> that 'msg' is freed in all exit paths. Detected by Coverity CID 1309666.
> 
> Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
> ---
> Compile tested only. Applies against linux-next.
> ---
>  drivers/platform/chrome/cros_ec_lightbar.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)

This is not an MFD patch.

> diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
> index 144e09df9b84..4e598c11e8a4 100644
> --- a/drivers/platform/chrome/cros_ec_lightbar.c
> +++ b/drivers/platform/chrome/cros_ec_lightbar.c
> @@ -252,7 +252,7 @@ static ssize_t led_rgb_store(struct device *dev, struct device_attribute *attr,
>  
>  		ret = sscanf(buf, "%i", &val[i++]);
>  		if (ret == 0)
> -			return -EINVAL;
> +			goto exit;
>  
>  		if (i == 4) {
>  			param = (struct ec_params_lightbar *)msg->data;
> @@ -268,17 +268,15 @@ static ssize_t led_rgb_store(struct device *dev, struct device_attribute *attr,
>  			if ((j++ % 4) == 0) {
>  				ret = lb_throttle();
>  				if (ret)
> -					return ret;
> +					goto exit;
>  			}
>  
>  			ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
>  			if (ret < 0)
>  				goto exit;
>  
> -			if (msg->result != EC_RES_SUCCESS) {
> -				ret = -EINVAL;
> +			if (msg->result != EC_RES_SUCCESS)
>  				goto exit;
> -			}
>  
>  			i = 0;
>  			ok = 1;

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog