diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2021-08-06 09:59:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-06 15:18:40 +0200 |
| commit | de0534df93474f268486c486ea7e01b44a478026 (patch) | |
| tree | 93262aac76210b8a1249b310dc3c7ed61f1d68c7 /drivers | |
| parent | 7b808449f572d07bee840cd9da7e2fe6a1b8f4b5 (diff) | |
| download | linux-rpi-de0534df93474f268486c486ea7e01b44a478026.tar.gz linux-rpi-de0534df93474f268486c486ea7e01b44a478026.tar.bz2 linux-rpi-de0534df93474f268486c486ea7e01b44a478026.zip | |
nvmem: core: fix error handling while validating keepout regions
Current error path on failure of validating keepout regions is calling
put_device, eventhough the device is not even registered at that point.
Fix this by adding proper error handling of freeing ida and nvmem.
Fixes: fd3bb8f54a88 ("nvmem: core: Add support for keepout regions")
Cc: <stable@vger.kernel.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210806085947.22682-5-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvmem/core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index b3bc30a04ed7..3d87fadaa160 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -824,8 +824,11 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); - if (rval) - goto err_put_device; + if (rval) { + ida_free(&nvmem_ida, nvmem->id); + kfree(nvmem); + return ERR_PTR(rval); + } } dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); |