Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1659903 > unrolled thread

Re: [PATCH] nvmem: core: fix leaks on registration errors

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH] nvmem: core: fix leaks on registration errors Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2017-06-07 17:00 +0200

#1659903 — Re: [PATCH] nvmem: core: fix leaks on registration errors

On 16/05/17 14:44, Johan Hovold wrote:
> Make sure to deregister and release the nvmem device and underlying
> memory on registration errors.
>
> Note that the private data must be freed using put_device() once the
> struct device has been initialised.
>
> Also note that there's a related reference leak in the deregistration
> function as reported by Mika Westerberg which is being fixed separately.
>
> Fixes: b6c217ab9be6 ("nvmem: Add backwards compatibility support for older EEPROM drivers.")
> Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers")
> Cc: stable <stable@vger.kernel.org>     # 4.3
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/nvmem/core.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)

Thanks for the patch,
Will queue this one along with the "[PATCH 2/2] nvmem: core: Call 
put_device() in nvmem_unregister()" patch from Andrey Smirnov


thanks
srini
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index 8c830a80a648..6cf916d9db6d 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -489,21 +489,24 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
>
>  	rval = device_add(&nvmem->dev);
>  	if (rval)
> -		goto out;
> +		goto err_put_device;
>
>  	if (config->compat) {
>  		rval = nvmem_setup_compat(nvmem, config);
>  		if (rval)
> -			goto out;
> +			goto err_device_del;
>  	}
>
>  	if (config->cells)
>  		nvmem_add_cells(nvmem, config);
>
>  	return nvmem;
> -out:
> -	ida_simple_remove(&nvmem_ida, nvmem->id);
> -	kfree(nvmem);
> +
> +err_device_del:
> +	device_del(&nvmem->dev);
> +err_put_device:
> +	put_device(&nvmem->dev);
> +
>  	return ERR_PTR(rval);
>  }
>  EXPORT_SYMBOL_GPL(nvmem_register);
>

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web