Messages in this thread | | | Subject | Re: [PATCH v3 1/7] nvmem: fix memory leak in error path | From | Srinivas Kandagatla <> | Date | Wed, 19 Feb 2020 10:52:20 +0000 |
| |
On 19/02/2020 09:22, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski<bgolaszewski@baylibre.com> > > We need to free the ida mapping and nvmem struct if the write-protect > GPIO lookup fails. > > Fixes: 2a127da461a9 ("nvmem: add support for the write-protect pin") > Signed-off-by: Bartosz Golaszewski<bgolaszewski@baylibre.com> > --- > drivers/nvmem/core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c > index ef326f243f36..89974e40d250 100644 > --- a/drivers/nvmem/core.c > +++ b/drivers/nvmem/core.c > @@ -352,8 +352,11 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) > else > nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", > GPIOD_OUT_HIGH); > - if (IS_ERR(nvmem->wp_gpio)) > - return ERR_CAST(nvmem->wp_gpio); > + if (IS_ERR(nvmem->wp_gpio)) { > + ida_simple_remove(&nvmem_ida, nvmem->id); > + kfree(nvmem); > + return ERR_PTR(rval);
Why are you returning rval here? This points return value of ida_simple_get and not the actual error code from wp_gpio.
--srini
> + }
| |