Unverified Commit 0925ddf4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12549 fs/inode: Prevent dump_mapping() accessing invalid dentry.d_name.name 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3LJQPRF77KQ3BSTSYOOMYPKD2E7GX4IH/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRAZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/12549

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents b89acfed 353e0d35

mm/debug.c

+7 −5
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ void __dump_page(struct page *page, const char *reason) 
		struct hlist_node *dentry_first;

		struct dentry *dentry_ptr;

		struct dentry dentry;

		char fname[64] = {};

		unsigned long ino;



		/*
@@ -154,13 +155,14 @@ void __dump_page(struct page *page, const char *reason) 
			pr_warn("aops:%ps ino:%lx with invalid dentry %px\n",

					a_ops, ino, dentry_ptr);

		} else {

			if (strncpy_from_kernel_nofault(fname, dentry.d_name.name, 63) < 0)

				strscpy(fname, "<invalid>", sizeof(fname));

			/*

			 * if dentry is corrupted, the %pd handler may still

			 * crash, but it's unlikely that we reach here with a

			 * corrupted struct page

			 * Even if strncpy_from_kernel_nofault() succeeded,

			 * the fname could be unreliable

			 */

			pr_warn("aops:%ps ino:%lx dentry name:\"%pd\"\n",

					a_ops, ino, &dentry);

			pr_warn("aops:%ps ino:%lx dentry name(?):\"%s\"\n",

					a_ops, ino, fname);

		}

	}

out_mapping: