Skip to contentSkip to conversation

kprobes: no need to check return value of debugfs_create functions

PATCH In review Greg Kroah-Hartman 2 participants 4 messages Jan 22, 2019 – Jan 23, 2019 kprobes

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kprobes: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

Cc "Naveen N. Rao" <[email protected]>
Cc Anil S Keshavamurthy <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Masami Hiramatsu <[email protected]>
---
 kernel/kprobes.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)
kernel/kprobes.c +6 -19
index f4ddfdd2d07e..7287e7de2350 100644
@@ -2566,33 +2566,20 @@ static const struct file_operations fops_kp = {
 
 static int __init debugfs_kprobe_init(void)
 {
-	struct dentry *dir, *file;
+	struct dentry *dir;
 	unsigned int value = 1;
 
 	dir = debugfs_create_dir("kprobes", NULL);
-	if (!dir)
-		return -ENOMEM;
 
-	file = debugfs_create_file("list", 0400, dir, NULL,
-				&debugfs_kprobes_operations);
-	if (!file)
-		goto error;
+	debugfs_create_file("list", 0400, dir, NULL,
+			    &debugfs_kprobes_operations);
 
-	file = debugfs_create_file("enabled", 0600, dir,
-					&value, &fops_kp);
-	if (!file)
-		goto error;
+	debugfs_create_file("enabled", 0600, dir, &value, &fops_kp);
 
-	file = debugfs_create_file("blacklist", 0400, dir, NULL,
-				&debugfs_kprobe_blacklist_ops);
-	if (!file)
-		goto error;
+	debugfs_create_file("blacklist", 0400, dir, NULL,
+			    &debugfs_kprobe_blacklist_ops);
 
 	return 0;
-
-error:
-	debugfs_remove(dir);
-	return -ENOMEM;
 }
 
 late_initcall(debugfs_kprobe_init);
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 18 lines · On Tue, 22 Jan 2019 16:21:46 +0100 Greg Kroah-Hartman…

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

Cc "Naveen N. Rao" <[email protected]>
Cc Anil S Keshavamurthy <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Masami Hiramatsu <[email protected]>
---
 kernel/kprobes.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)
kernel/kprobes.c +0 -0
index f4ddfdd2d07e..7287e7de2350 100644

kernel/kprobes.c static const struct file_operations fops_kp = { · line 2574

Quoted 10 lines
kernel/kprobes.c +1 -3
@@ -2566,33 +2566,20 @@ static const struct file_operations fops_kp = {
 
 static int __init debugfs_kprobe_init(void)
 {
-	struct dentry *dir, *file;
+	struct dentry *dir;
 	unsigned int value = 1;
 
 	dir = debugfs_create_dir("kprobes", NULL);
-	if (!dir)
-		return -ENOMEM;

Here, I think IS_ERR(dir) is OK for debugfs_create_file(), but dir == NULL has different meaning. I think we'd better keep this check. (I see, -ENOMEM will be no good...)

Thank you,

Quoted 32 lines
kernel/kprobes.c +5 -16
-	file = debugfs_create_file("list", 0400, dir, NULL,
-				&debugfs_kprobes_operations);
-	if (!file)
-		goto error;
+	debugfs_create_file("list", 0400, dir, NULL,
+			    &debugfs_kprobes_operations);
 
-	file = debugfs_create_file("enabled", 0600, dir,
-					&value, &fops_kp);
-	if (!file)
-		goto error;
+	debugfs_create_file("enabled", 0600, dir, &value, &fops_kp);
 
-	file = debugfs_create_file("blacklist", 0400, dir, NULL,
-				&debugfs_kprobe_blacklist_ops);
-	if (!file)
-		goto error;
+	debugfs_create_file("blacklist", 0400, dir, NULL,
+			    &debugfs_kprobe_blacklist_ops);
 
 	return 0;
-
-error:
-	debugfs_remove(dir);
-	return -ENOMEM;
 }
 
 late_initcall(debugfs_kprobe_init);
Signature · 1 line
2.20.1
Signature · 1 line
Masami Hiramatsu <[email protected]>
#2 lore raw
Quoted 28 lines · Masami Hiramatsu
Quoted 25 lines · On Tue, 22 Jan 2019 16:21:46 +0100 Greg Kroah-Hartman…

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

Cc "Naveen N. Rao" <[email protected]>
Cc Anil S Keshavamurthy <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Masami Hiramatsu <[email protected]>
---
 kernel/kprobes.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)
kernel/kprobes.c +1 -1
index f4ddfdd2d07e..7287e7de2350 100644
@@ -2566,33 +2566,20 @@ static const struct file_operations fops_kp = {
 
 static int __init debugfs_kprobe_init(void)
 {
-	struct dentry *dir, *file;
+	struct dentry *dir;
 	unsigned int value = 1;
 
Quoted 7 lines

kernel/kprobes.c static const struct file_operations fops_kp = { · line 2574

Quoted 3 lines
kernel/kprobes.c +0 -2
 	dir = debugfs_create_dir("kprobes", NULL);
-	if (!dir)
-		return -ENOMEM;

Here, I think IS_ERR(dir) is OK for debugfs_create_file(), but dir == NULL has different meaning. I think we'd better keep this check. (I see, -ENOMEM will be no good...)

dir == NULL means the system is out of memory. Which I'll change and just make it return an error, so it is fine to ignore this value.

thanks,

greg k-h

maintainer Acked-by
#3 lore raw
Quoted 37 lines · On Wed, 23 Jan 2019 07:54:22 +0100 Greg Kroah-Hartman…
Quoted 28 lines · Masami Hiramatsu
Quoted 25 lines · On Tue, 22 Jan 2019 16:21:46 +0100 Greg Kroah-Hartman…

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

Cc "Naveen N. Rao" <[email protected]>
Cc Anil S Keshavamurthy <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Masami Hiramatsu <[email protected]>
---
 kernel/kprobes.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)
kernel/kprobes.c +1 -1
index f4ddfdd2d07e..7287e7de2350 100644
@@ -2566,33 +2566,20 @@ static const struct file_operations fops_kp = {
 
 static int __init debugfs_kprobe_init(void)
 {
-	struct dentry *dir, *file;
+	struct dentry *dir;
 	unsigned int value = 1;
 
Quoted 7 lines

kernel/kprobes.c static const struct file_operations fops_kp = { · line 2574

Quoted 3 lines
kernel/kprobes.c +0 -2
 	dir = debugfs_create_dir("kprobes", NULL);
-	if (!dir)
-		return -ENOMEM;

Here, I think IS_ERR(dir) is OK for debugfs_create_file(), but dir == NULL has different meaning. I think we'd better keep this check. (I see, -ENOMEM will be no good...)

Quoted 2 lines

dir == NULL means the system is out of memory. Which I'll change and just make it return an error, so it is fine to ignore this value.

Got it! Thanks!

Quoted 4 lines

thanks,

greg k-h

Signature · 1 line
Masami Hiramatsu <[email protected]>