nvmem: core: add error handling for dev_set_name

[ Upstream commit 5544e90c81261e82e02bbf7c6015a4b9c8c825ef ]

The type of return value of dev_set_name is int, which may return
wrong result, so we add error handling for it to reclaim memory
of nvmem resource, and return early when an error occurs.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220916122100.170016-4-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: ab3428cfd9aa ("nvmem: core: fix registration vs use race")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index ee86022c4f2b8bd317a65009f401ded0cd85d708..51bec9f8a3bf978b27473a397178a16b6db5465b 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -804,18 +804,24 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 
        switch (config->id) {
        case NVMEM_DEVID_NONE:
-               dev_set_name(&nvmem->dev, "%s", config->name);
+               rval = dev_set_name(&nvmem->dev, "%s", config->name);
                break;
        case NVMEM_DEVID_AUTO:
-               dev_set_name(&nvmem->dev, "%s%d", config->name, nvmem->id);
+               rval = dev_set_name(&nvmem->dev, "%s%d", config->name, nvmem->id);
                break;
        default:
-               dev_set_name(&nvmem->dev, "%s%d",
+               rval = dev_set_name(&nvmem->dev, "%s%d",
                             config->name ? : "nvmem",
                             config->name ? config->id : nvmem->id);
                break;
        }
 
+       if (rval) {
+               ida_free(&nvmem_ida, nvmem->id);
+               kfree(nvmem);
+               return ERR_PTR(rval);
+       }
+
        nvmem->read_only = device_property_present(config->dev, "read-only") ||
                           config->read_only || !nvmem->reg_write;