From: zhong jiang <zhongjiang@huawei.com>
Date: Tue, 30 Oct 2018 22:04:51 +0000 (-0700)
Subject: kernel/fail_function.c: remove meaningless null pointer check before debugfs_remove_r... 
X-Git-Tag: v4.20-rc1~52^2~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea6f650465c61c70b4c96648ed2cb8a0c55db337;p=thirdparty%2Fkernel%2Flinux.git

kernel/fail_function.c: remove meaningless null pointer check before debugfs_remove_recursive

debugfs_remove_recursive() has taken the null pointer into account.  just
remove the null check before debugfs_remove_recursive().

Link: http://lkml.kernel.org/r/1537494404-16473-1-git-send-email-zhongjiang@huawei.com
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/fail_function.c b/kernel/fail_function.c
index bc80a4e268c0b..17f75b545f665 100644
--- a/kernel/fail_function.c
+++ b/kernel/fail_function.c
@@ -173,8 +173,7 @@ static void fei_debugfs_remove_attr(struct fei_attr *attr)
 	struct dentry *dir;
 
 	dir = debugfs_lookup(attr->kp.symbol_name, fei_debugfs_dir);
-	if (dir)
-		debugfs_remove_recursive(dir);
+	debugfs_remove_recursive(dir);
 }
 
 static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)