[merged] error-injection-remove-meaningless-null-pointer-check-before-debugfs_remove_recursive.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kernel/fail_function.c: remove meaningless null pointer check before debugfs_remove_recursive
has been removed from the -mm tree.  Its filename was
     error-injection-remove-meaningless-null-pointer-check-before-debugfs_remove_recursive.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: zhong jiang <zhongjiang@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx
Signed-off-by: zhong jiang <zhongjiang@xxxxxxxxxx>
Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/fail_function.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/kernel/fail_function.c~error-injection-remove-meaningless-null-pointer-check-before-debugfs_remove_recursive
+++ a/kernel/fail_function.c
@@ -173,8 +173,7 @@ static void fei_debugfs_remove_attr(stru
 	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)
_

Patches currently in -mm which might be from zhongjiang@xxxxxxxxxx are

mm-page_owner-align-with-pageblock_nr-pages.patch
kernel-kexec_file-remove-some-duplicated-include-file.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux