From: Haotian Zhang <vulab@iscas.ac.cn>
To: tony.luck@intel.com, bp@alien8.de, qiuxu.zhuo@intel.com
Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org,
Haotian Zhang <vulab@iscas.ac.cn>
Subject: [PATCH v2] ras: cec: Fix debugfs error checking
Date: Thu, 20 Nov 2025 16:07:08 +0800 [thread overview]
Message-ID: <20251120080708.427-1-vulab@iscas.ac.cn> (raw)
The debugfs_create_dir() and debugfs_create_file() functions return
ERR_PTR() on error, not NULL. The current null-checks fail to detect
errors because ERR_PTR() encodes error codes as non-null pointer values.
Replace the null-checks with IS_ERR() for all debugfs_create_dir() and
debugfs_create_file() and ras_get_debugfs_root calls to properly
handle errors.
Fixes: 011d82611172 ("RAS: Add a Corrected Errors Collector")
Suggested-by: Zhuo, Qiuxu <qiuxu.zhuo@intel.com>
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
---
Changes in v2:
-Add fixes in create_debugfs_nodes() and ras_add_daemon_trace()
as suggested by Zhuo, Qiuxu.
---
drivers/ras/cec.c | 12 ++++++------
drivers/ras/debugfs.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
index e440b15fbabc..25aa5f2a18b2 100644
--- a/drivers/ras/cec.c
+++ b/drivers/ras/cec.c
@@ -483,27 +483,27 @@ static int __init create_debugfs_nodes(void)
struct dentry *d, *pfn, *decay, *count, *array, *dfs;
dfs = ras_get_debugfs_root();
- if (!dfs) {
+ if (IS_ERR(dfs)) {
pr_warn("Error getting RAS debugfs root!\n");
return -1;
}
d = debugfs_create_dir("cec", dfs);
- if (!d) {
+ if (IS_ERR(d)) {
pr_warn("Error creating cec debugfs node!\n");
return -1;
}
decay = debugfs_create_file("decay_interval", S_IRUSR | S_IWUSR, d,
&decay_interval, &decay_interval_ops);
- if (!decay) {
+ if (IS_ERR(decay)) {
pr_warn("Error creating decay_interval debugfs node!\n");
goto err;
}
count = debugfs_create_file("action_threshold", S_IRUSR | S_IWUSR, d,
&action_threshold, &action_threshold_ops);
- if (!count) {
+ if (IS_ERR(count)) {
pr_warn("Error creating action_threshold debugfs node!\n");
goto err;
}
@@ -512,13 +512,13 @@ static int __init create_debugfs_nodes(void)
return 0;
pfn = debugfs_create_file("pfn", S_IRUSR | S_IWUSR, d, &dfs_pfn, &pfn_ops);
- if (!pfn) {
+ if (IS_ERR(pfn)) {
pr_warn("Error creating pfn debugfs node!\n");
goto err;
}
array = debugfs_create_file("array", S_IRUSR, d, NULL, &array_fops);
- if (!array) {
+ if (IS_ERR(array)) {
pr_warn("Error creating array debugfs node!\n");
goto err;
}
diff --git a/drivers/ras/debugfs.c b/drivers/ras/debugfs.c
index 42afd3de68b2..8f817bd9cb09 100644
--- a/drivers/ras/debugfs.c
+++ b/drivers/ras/debugfs.c
@@ -47,7 +47,7 @@ int __init ras_add_daemon_trace(void)
{
struct dentry *fentry;
- if (!ras_debugfs_dir)
+ if (IS_ERR(ras_debugfs_dir))
return -ENOENT;
fentry = debugfs_create_file("daemon_active", S_IRUSR, ras_debugfs_dir,
--
2.50.1.windows.1
next reply other threads:[~2025-11-20 8:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-20 8:07 Haotian Zhang [this message]
2025-11-20 12:22 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251120080708.427-1-vulab@iscas.ac.cn \
--to=vulab@iscas.ac.cn \
--cc=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=qiuxu.zhuo@intel.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®