From: Zhihao Cheng <chengzhihao1@huawei.com>
To: <richard@nod.at>, <miquel.raynal@bootlin.com>,
<ben.hutchings@mind.be>, <daniel@makrotopia.org>
Cc: <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 2/4] ubi: ubi_init: Fix missed ubiblock cleanup in error handling path
Date: Thu, 11 Apr 2024 11:19:01 +0800 [thread overview]
Message-ID: <20240411031903.3050278-3-chengzhihao1@huawei.com> (raw)
In-Reply-To: <20240411031903.3050278-1-chengzhihao1@huawei.com>
The ubiblock_init called by ubi_init will register device number, but
device number is not released in error handling path of ubi_init when
ubi is loaded by inserting module (eg. attaching failure), which leads
to subsequent ubi_init calls failed by running out of device number
(dmesg shows that "__register_blkdev: failed to get major for ubiblock").
Since ubiblock_init() registers notifier and invokes notification
functions, so we can move it after ubi_init_attach() to fix the problem.
Fixes: 927c145208b0 ("mtd: ubi: attach from device tree")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
drivers/mtd/ubi/build.c | 51 +++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 7f95fd7968a8..bc63fbf5e947 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1263,9 +1263,21 @@ static struct mtd_notifier ubi_mtd_notifier = {
.remove = ubi_notify_remove,
};
+static void detach_mtd_devs(int count)
+{
+ int i;
+
+ for (i = 0; i < count; i++)
+ if (ubi_devices[i]) {
+ mutex_lock(&ubi_devices_mutex);
+ ubi_detach_mtd_dev(ubi_devices[i]->ubi_num, 1);
+ mutex_unlock(&ubi_devices_mutex);
+ }
+}
+
static int __init ubi_init_attach(void)
{
- int err, i, k;
+ int err, i;
/* Attach MTD devices */
for (i = 0; i < mtd_devs; i++) {
@@ -1317,12 +1329,7 @@ static int __init ubi_init_attach(void)
return 0;
out_detach:
- for (k = 0; k < i; k++)
- if (ubi_devices[k]) {
- mutex_lock(&ubi_devices_mutex);
- ubi_detach_mtd_dev(ubi_devices[k]->ubi_num, 1);
- mutex_unlock(&ubi_devices_mutex);
- }
+ detach_mtd_devs(i);
return err;
}
#ifndef CONFIG_MTD_UBI_MODULE
@@ -1366,15 +1373,6 @@ static int __init ubi_init(void)
if (err)
goto out_slab;
- err = ubiblock_init();
- if (err) {
- pr_err("UBI error: block: cannot initialize, error %d\n", err);
-
- /* See comment above re-ubi_is_module(). */
- if (ubi_is_module())
- goto out_debugfs;
- }
-
register_mtd_user(&ubi_mtd_notifier);
if (ubi_is_module()) {
@@ -1383,11 +1381,21 @@ static int __init ubi_init(void)
goto out_mtd_notifier;
}
+ err = ubiblock_init();
+ if (err) {
+ pr_err("UBI error: block: cannot initialize, error %d\n", err);
+
+ /* See comment above re-ubi_is_module(). */
+ if (ubi_is_module())
+ goto out_detach;
+ }
+
return 0;
+out_detach:
+ detach_mtd_devs(mtd_devs);
out_mtd_notifier:
unregister_mtd_user(&ubi_mtd_notifier);
-out_debugfs:
ubi_debugfs_exit();
out_slab:
kmem_cache_destroy(ubi_wl_entry_slab);
@@ -1403,17 +1411,10 @@ device_initcall(ubi_init);
static void __exit ubi_exit(void)
{
- int i;
-
ubiblock_exit();
unregister_mtd_user(&ubi_mtd_notifier);
- for (i = 0; i < UBI_MAX_DEVICES; i++)
- if (ubi_devices[i]) {
- mutex_lock(&ubi_devices_mutex);
- ubi_detach_mtd_dev(ubi_devices[i]->ubi_num, 1);
- mutex_unlock(&ubi_devices_mutex);
- }
+ detach_mtd_devs(UBI_MAX_DEVICES);
ubi_debugfs_exit();
kmem_cache_destroy(ubi_wl_entry_slab);
misc_deregister(&ubi_ctrl_cdev);
--
2.39.2
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2024-04-11 3:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 3:18 [PATCH v2 0/4] ubi: Fix serious of resource leaking problems Zhihao Cheng
2024-04-11 3:19 ` [PATCH v2 1/4] ubi: ubi_init: Fix missed debugfs cleanup in error handling path Zhihao Cheng
2024-04-11 3:19 ` Zhihao Cheng [this message]
2024-04-11 15:48 ` [PATCH v2 2/4] ubi: ubi_init: Fix missed ubiblock " Daniel Golle
2024-04-12 1:20 ` Zhihao Cheng
2024-04-11 16:43 ` Markus Elfring
2024-04-11 3:19 ` [PATCH v2 3/4] mtd: ubi: Ignore all debugfs initialisation failures Zhihao Cheng
2024-04-11 3:19 ` [PATCH v2 4/4] ubi: debugfs: Replace IS_ERR_OR_NULL with IS_ERR in error checking path Zhihao Cheng
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=20240411031903.3050278-3-chengzhihao1@huawei.com \
--to=chengzhihao1@huawei.com \
--cc=ben.hutchings@mind.be \
--cc=daniel@makrotopia.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).