Skip to contentSkip to conversation

xen/debugfs: Check debugfs initialization before using it

PATCH In review Ethan Zhao 2 participants 2 messages Dec 9, 2013

Subsystems (2)
lore
Share & tools
lore

Ethan Zhao

author
#0 lore raw

PATCH 1/1 xen/debugfs: Check debugfs initialization before using it

From: "Ethan Zhao" <[email protected]>

Should check debugfs initialization with debugfs_initialized() before using it, Because if it isn't initialized, the return value of fake debugfs_create_dir() etc functions would be ERR_PTR(-ENODEV), checking with NULL will not work.

V3: Add warning message about debugfs not configured or disabled.

---
 arch/x86/xen/debugfs.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/xen/debugfs.c +7 -0
index c8377fb..033a5dd 100644
@@ -9,12 +9,19 @@ static struct dentry *d_xen_debug;
 
 struct dentry * __init xen_init_debugfs(void)
 {
+	if (!debugfs_initialized()) {
+		d_xen_debug = NULL;
+		pr_warning("debugfs is not configured or enabled\n");
+		goto nodebugfs;
+	}
+
 	if (!d_xen_debug) {
 		d_xen_debug = debugfs_create_dir("xen", NULL);
 
 		if (!d_xen_debug)
 			pr_warning("Could not create 'xen' debugfs directory\n");
 	}
+nodebugfs:
 
 	return d_xen_debug;
 }
Signature · 1 line
1.8.3.4 (Apple Git-47)
#1 lore raw
Quoted 18 lines · Ethan Zhao

From: "Ethan Zhao" <[email protected]>

Should check debugfs initialization with debugfs_initialized() before using it, Because if it isn't initialized, the return value of fake debugfs_create_dir() etc functions would be ERR_PTR(-ENODEV), checking with NULL will not work.

V3: Add warning message about debugfs not configured or disabled.

---
 arch/x86/xen/debugfs.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/xen/debugfs.c +0 -0
index c8377fb..033a5dd 100644

arch/x86/xen/debugfs.c static struct dentry *d_xen_debug; · line 14

Quoted 6 lines
arch/x86/xen/debugfs.c +3 -0
@@ -9,12 +9,19 @@ static struct dentry *d_xen_debug;
 
 struct dentry * __init xen_init_debugfs(void)
 {
+	if (!debugfs_initialized()) {
+		d_xen_debug = NULL;
+		pr_warning("debugfs is not configured or enabled\n");

No, again, don't say anything, this is useless, just leave the code as-is, it isn't causing any problems, is it?

gre gk-h