]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
fail_function: no need to check return value of debugfs_create functions
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Jan 2019 15:21:44 +0000 (16:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Jun 2019 13:49:06 +0000 (15:49 +0200)
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: Kees Cook <keescook@chromium.org>
Cc: Josef Bacik <jbacik@fb.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Cc: zhong jiang <zhongjiang@huawei.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/fail_function.c

index feb80712b913cbb8f9e0cd79b2e766b5cc2476f2..63b349168da7255a13cbaadca263922a9826b581 100644 (file)
@@ -152,20 +152,13 @@ static int fei_retval_get(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(fei_retval_ops, fei_retval_get, fei_retval_set,
                         "%llx\n");
 
-static int fei_debugfs_add_attr(struct fei_attr *attr)
+static void fei_debugfs_add_attr(struct fei_attr *attr)
 {
        struct dentry *dir;
 
        dir = debugfs_create_dir(attr->kp.symbol_name, fei_debugfs_dir);
-       if (!dir)
-               return -ENOMEM;
-
-       if (!debugfs_create_file("retval", 0600, dir, attr, &fei_retval_ops)) {
-               debugfs_remove_recursive(dir);
-               return -ENOMEM;
-       }
 
-       return 0;
+       debugfs_create_file("retval", 0600, dir, attr, &fei_retval_ops);
 }
 
 static void fei_debugfs_remove_attr(struct fei_attr *attr)
@@ -306,7 +299,7 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
 
        ret = register_kprobe(&attr->kp);
        if (!ret)
-               ret = fei_debugfs_add_attr(attr);
+               fei_debugfs_add_attr(attr);
        if (ret < 0)
                fei_attr_remove(attr);
        else {
@@ -337,19 +330,13 @@ static int __init fei_debugfs_init(void)
                return PTR_ERR(dir);
 
        /* injectable attribute is just a symlink of error_inject/list */
-       if (!debugfs_create_symlink("injectable", dir,
-                                   "../error_injection/list"))
-               goto error;
+       debugfs_create_symlink("injectable", dir, "../error_injection/list");
 
-       if (!debugfs_create_file("inject", 0600, dir, NULL, &fei_ops))
-               goto error;
+       debugfs_create_file("inject", 0600, dir, NULL, &fei_ops);
 
        fei_debugfs_dir = dir;
 
        return 0;
-error:
-       debugfs_remove_recursive(dir);
-       return -ENOMEM;
 }
 
 late_initcall(fei_debugfs_init);