diff options
| author | Tan Xiaojun <tanxiaojun@huawei.com> | 2015-10-14 04:49:24 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2015-10-14 19:50:32 +0300 |
| commit | 30f84a891bf6dc7ffb9c0d0f3361ca6375633ac1 (patch) | |
| tree | b930629ab7765f7657de650c43eeb59780812364 | |
| parent | 90b3b37383fd083481655d5529686ca4eda4da2b (diff) | |
| download | linux-30f84a891bf6dc7ffb9c0d0f3361ca6375633ac1.tar.xz | |
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>
| -rw-r--r-- | drivers/edac/debugfs.c | 2 | ||||
| -rw-r--r-- | drivers/edac/edac_mc_sysfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/debugfs.c b/drivers/edac/debugfs.c index 4864703115cc..54d2f668cb0a 100644 --- a/drivers/edac/debugfs.c +++ b/drivers/edac/debugfs.c @@ -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; } diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 3929391f0b92..a75acea0f674 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -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); |