ubifs: dbg_check_idx_size: Fix kmemleak if loading znode failed

If function dbg_check_idx_size() failed by loading znode in mounting
process, there are two problems:
  1. Allocated znodes won't be freed, which causes kmemleak in kernel:
     ubifs_mount
      dbg_check_idx_size
       dbg_walk_index
        c->zroot.znode = ubifs_load_znode
	child = ubifs_load_znode // failed
	// Loaded znodes won't be freed in error handling path.
  2. Global variable ubifs_clean_zn_cnt is not decreased, because
     ubifs_tnc_close() is not invoked in error handling path, which
     triggers a warning in ubifs_exit():
      WARNING: CPU: 1 PID: 1576 at fs/ubifs/super.c:2486 ubifs_exit
      Modules linked in: zstd ubifs(-) ubi nandsim
      CPU: 1 PID: 1576 Comm: rmmod Not tainted 6.7.0-rc6
      Call Trace:
	ubifs_exit+0xca/0xc70 [ubifs]
	__do_sys_delete_module+0x29a/0x4a0
	do_syscall_64+0x6f/0x140

Fix it by adding error handling path in dbg_check_idx_size() to release
tnc tree.

Fixes: 1e51764a3c2a ("UBIFS: add new flash file system")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Suggested-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index d013c5b3f1edaeb3d17b351dc61286331a4b6161..ac77ac1fd73e351863c0d7ab98f86c1f12a82b9f 100644 (file)
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -1742,17 +1742,22 @@ int dbg_check_idx_size(struct ubifs_info *c, long long idx_size)
        err = dbg_walk_index(c, NULL, add_size, &calc);
        if (err) {
                ubifs_err(c, "error %d while walking the index", err);
-               return err;
+               goto out_err;
        }
 
        if (calc != idx_size) {
                ubifs_err(c, "index size check failed: calculated size is %lld, should be %lld",
                          calc, idx_size);
                dump_stack();
-               return -EINVAL;
+               err = -EINVAL;
+               goto out_err;
        }
 
        return 0;
+
+out_err:
+       ubifs_destroy_tnc_tree(c);
+       return err;
 }
 
 /**

diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index f4728e65d1bda4d4838b4373de92df76f3c2a4ae..45cacdcd4746bcdc276eda7b4686cf09dbf6481a 100644 (file)
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -3116,14 +3116,7 @@ static void tnc_destroy_cnext(struct ubifs_info *c)
 void ubifs_tnc_close(struct ubifs_info *c)
 {
        tnc_destroy_cnext(c);
-       if (c->zroot.znode) {
-               long n, freed;
-
-               n = atomic_long_read(&c->clean_zn_cnt);
-               freed = ubifs_destroy_tnc_subtree(c, c->zroot.znode);
-               ubifs_assert(c, freed == n);
-               atomic_long_sub(n, &ubifs_clean_zn_cnt);
-       }
+       ubifs_destroy_tnc_tree(c);
        kfree(c->gap_lebs);
        kfree(c->ilebs);
        destroy_old_idx(c);

diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index 4d686e34e64d99feb54a3ab351fbf31fd6a5a476..d3f8a6aa1f49da522941d9e3e94130715d19c591 100644 (file)
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -250,6 +250,28 @@ long ubifs_destroy_tnc_subtree(const struct ubifs_info *c,
        }
 }
 
+/**
+ * ubifs_destroy_tnc_tree - destroy all znodes connected to the TNC tree.
+ * @c: UBIFS file-system description object
+ *
+ * This function destroys the whole TNC tree and updates clean global znode
+ * count.
+ */
+void ubifs_destroy_tnc_tree(struct ubifs_info *c)
+{
+       long n, freed;
+
+       if (!c->zroot.znode)
+               return;
+
+       n = atomic_long_read(&c->clean_zn_cnt);
+       freed = ubifs_destroy_tnc_subtree(c, c->zroot.znode);
+       ubifs_assert(c, freed == n);
+       atomic_long_sub(n, &ubifs_clean_zn_cnt);
+
+       c->zroot.znode = NULL;
+}
+
 /**
  * read_znode - read an indexing node from flash and fill znode.
  * @c: UBIFS file-system description object

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 3916dc4f30caa65072eb90b3d78762f41d56c82a..6eba287ae66c440c80147355d2fc21381dff78b8 100644 (file)
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1903,6 +1903,7 @@ struct ubifs_znode *ubifs_tnc_postorder_next(const struct ubifs_info *c,
                                             struct ubifs_znode *znode);
 long ubifs_destroy_tnc_subtree(const struct ubifs_info *c,
                               struct ubifs_znode *zr);
+void ubifs_destroy_tnc_tree(struct ubifs_info *c);
 struct ubifs_znode *ubifs_load_znode(struct ubifs_info *c,
                                     struct ubifs_zbranch *zbr,
                                     struct ubifs_znode *parent, int iip);