Commit 30f84a89 authored Oct 14, 2015 by Tan Xiaojun Committed by Borislav Petkov Oct 14, 2015

EDAC: Use edac_debugfs_remove_recursive()



debugfs_remove() is used to remove a file or a directory from the
debugfs filesystem, but mci->debugfs might not empty.

This can be triggered by the following sequence:

1) Enable CONFIG_EDAC_DEBUG
2) insmod an EDAC module (like i3000_edac or similar)
3) rmmod this module
4) we can see files remaining under <debugfs_mountpoint>/edac/ like
   "fake_inject", for example.

Removing edac_core then, causes a NULL pointer dereference.

Reported-by: Yun Wu (Abel) <wuyun.wu@huawei.com>
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1444787364-104353-1-git-send-email-tanxiaojun@huawei.com


Signed-off-by: Borislav Petkov <bp@suse.de>

parent 90b3b373

drivers/edac/debugfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ int edac_create_debugfs_nodes(struct mem_ctl_info *mci)
		mci->debugfs = parent;
		return 0;
		nomem:
		debugfs_remove(mci->debugfs);
		edac_debugfs_remove_recursive(mci->debugfs);
		return -ENOMEM;
		}

drivers/edac/edac_mc_sysfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -976,7 +976,7 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
		edac_dbg(0, "\n");

		#ifdef CONFIG_EDAC_DEBUG
		debugfs_remove(mci->debugfs);
		edac_debugfs_remove_recursive(mci->debugfs);
		#endif
		#ifdef CONFIG_EDAC_LEGACY_SYSFS
		edac_delete_csrow_objects(mci);

Admin message