Commit 1b659b49 authored Oct 23, 2024 by Jinjie Ruan Committed by Li Huafei Oct 23, 2024

ntb: intel: Fix the NULL vs IS_ERR() bug for debugfs_create_dir()

stable inclusion
from stable-v6.6.54
commit 16e5bed6c1883b19f9fcbdff996aa3381954d5f3
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYQQS
CVE: CVE-2023-52917

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=16e5bed6c1883b19f9fcbdff996aa3381954d5f3



--------------------------------

[ Upstream commit e229897d373a87ee09ec5cc4ecd4bb2f895fc16b ]

The debugfs_create_dir() function returns error pointers.
It never returns NULL. So use IS_ERR() to check it.

Fixes: e26a5843 ("NTB: Split ntb_hw_intel and ntb_transport drivers")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Li Huafei <lihuafei1@huawei.com>

parent e7bc7968

drivers/ntb/hw/intel/ntb_hw_gen1.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -778,7 +778,7 @@ static void ndev_init_debugfs(struct intel_ntb_dev *ndev)
		ndev->debugfs_dir =
		debugfs_create_dir(pci_name(ndev->ntb.pdev),
		debugfs_dir);
		if (!ndev->debugfs_dir)
		if (IS_ERR(ndev->debugfs_dir))
		ndev->debugfs_info = NULL;
		else
		ndev->debugfs_info =