Unverified Commit 22f72139 authored Feb 27, 2025 by openeuler-ci-bot Committed by Gitee Feb 27, 2025

!15246 UBI/UBIFS mainline patch backport

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/QXLKTY5SMPBNARODPACSW26VX7OI22RS/ 
Denis Arefev (1):
  ubi: Add a check for ubi_num

pangliyuan (1):
  ubifs: skip dumping tnc tree when zroot is null

 
https://gitee.com/openeuler/kernel/issues/IBP1QB 
 
Link:https://gitee.com/openeuler/kernel/pulls/15246

 

Reviewed-by: Li Nan <linan122@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parents 86b997e0 c10fbc83

drivers/mtd/ubi/build.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1470,7 +1470,7 @@ static int ubi_mtd_param_parse(const char val, const struct kernel_param kp)
		if (token) {
		int err = kstrtoint(token, 10, &p->ubi_num);

		if (err) {
		if (err \|\| p->ubi_num < UBI_DEV_NUM_AUTO) {
		pr_err("UBI error: bad value for ubi_num parameter: %s\n",
		token);
		return -EINVAL;

fs/ubifs/debug.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -946,6 +946,7 @@ void ubifs_dump_tnc(struct ubifs_info *c)

		pr_err("\n");
		pr_err("(pid %d) start dumping TNC tree\n", current->pid);
		if (c->zroot.znode) {
		znode = ubifs_tnc_levelorder_next(c, c->zroot.znode, NULL);
		level = znode->level;
		pr_err("== Level %d ==\n", level);
		@@ -957,6 +958,9 @@ void ubifs_dump_tnc(struct ubifs_info *c)
		ubifs_dump_znode(c, znode);
		znode = ubifs_tnc_levelorder_next(c, c->zroot.znode, znode);
		}
		} else {
		pr_err("empty TNC tree in memory\n");
		}
		pr_err("(pid %d) finish dumping TNC tree\n", current->pid);
		}