From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, Michael Walle <michael@walle.cc>,
stable@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH 08/10] nvmem: core: fix cell removal on error
Date: Fri, 27 Jan 2023 10:40:13 +0000 [thread overview]
Message-ID: <20230127104015.23839-9-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org>
From: Michael Walle <michael@walle.cc>
nvmem_add_cells() could return an error after some cells are already
added to the provider. In this case, the added cells are not removed.
Remove any registered cells if nvmem_add_cells() fails.
Cc: stable@vger.kernel.org
Fixes: fa72d847d68d7 ("nvmem: check the return value of nvmem_add_cells()")
Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/nvmem/core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index cbe5df99db82..563116405b3d 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -847,7 +847,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
if (config->cells) {
rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
if (rval)
- goto err_teardown_compat;
+ goto err_remove_cells;
}
rval = nvmem_add_cells_from_table(nvmem);
@@ -870,7 +870,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
err_remove_cells:
nvmem_device_remove_all_cells(nvmem);
-err_teardown_compat:
if (config->compat)
nvmem_sysfs_remove_compat(nvmem, config);
err_put_device:
--
2.25.1
next prev parent reply other threads:[~2023-01-27 10:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 10:40 [PATCH 00/10] nvmem: fixes for 6.2 Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 01/10] nvmem: brcm_nvram: Add check for kzalloc Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 02/10] nvmem: sunxi_sid: Always use 32-bit MMIO reads Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 03/10] nvmem: core: initialise nvmem->id early Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 04/10] nvmem: core: remove nvmem_config wp_gpio Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 05/10] nvmem: core: fix cleanup after dev_set_name() Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 06/10] nvmem: core: fix registration vs use race Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 07/10] nvmem: core: fix device node refcounting Srinivas Kandagatla
2023-01-27 10:40 ` Srinivas Kandagatla [this message]
2023-01-27 10:40 ` [PATCH 09/10] nvmem: core: fix return value Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 10/10] nvmem: qcom-spmi-sdam: fix module autoloading Srinivas Kandagatla
2023-01-28 13:39 ` [PATCH 00/10] nvmem: fixes for 6.2 Greg KH
2023-01-30 11:03 ` Srinivas Kandagatla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230127104015.23839-9-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@walle.cc \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.