From 63c1b880d36e3879616ee5065555dc79f7e6faf6 Mon Sep 17 00:00:00 2001 From: Wang ShaoBo Date: Wed, 28 Jul 2021 15:07:04 +0800 Subject: [PATCH] Revert "kretprobe: check re-registration of the same kretprobe earlier" hulk inclusion category: bugfix bugzilla: 31369 CVE: NA ----------------------------------------------- This reverts commit bd1ed1b7338fc0a92402d0d7a0206f4add7ccdeb. Following patches mainline has fixed this issue: 0188b87899ff ("kretprobe: Avoid re-registration of the same kretprobe earlier") 33b1d1466885 ("kprobes: Warn if the kprobe is reregistered") Signed-off-by: Wang ShaoBo Reviewed-by: Cheng Jian Signed-off-by: Yang Yingliang --- kernel/kprobes.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index a1ba58e12b41..81259eecc4ed 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1957,14 +1957,6 @@ int register_kretprobe(struct kretprobe *rp) } } - /* - * Return error if it's being re-registered, - * also give a warning message to the developer. - */ - ret = check_kprobe_rereg(&rp->kp); - if (WARN_ON(ret)) - return ret; - rp->kp.pre_handler = pre_handler_kretprobe; rp->kp.post_handler = NULL; rp->kp.fault_handler = NULL; -- GitLab