Skip to content

Commit 9125258

Browse files
Wang ShaoBoksacilotto
authored andcommitted
kretprobe: Avoid re-registration of the same kretprobe earlier
BugLink: https://bugs.launchpad.net/bugs/1916066 commit 0188b87 upstream. Our system encountered a re-init error when re-registering same kretprobe, where the kretprobe_instance in rp->free_instances is illegally accessed after re-init. Implementation to avoid re-registration has been introduced for kprobe before, but lags for register_kretprobe(). We must check if kprobe has been re-registered before re-initializing kretprobe, otherwise it will destroy the data struct of kretprobe registered, which can lead to memory leak, system crash, also some unexpected behaviors. We use check_kprobe_rereg() to check if kprobe has been re-registered before running register_kretprobe()'s body, for giving a warning message and terminate registration process. Link: https://lkml.kernel.org/r/20210128124427.2031088-1-bobo.shaobowang@huawei.com Cc: stable@vger.kernel.org Fixes: 1f0ab40 ("kprobes: Prevent re-registration of the same kprobe") [ The above commit should have been done for kretprobes too ] Acked-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Acked-by: Ananth N Mavinakayanahalli <ananth@linux.ibm.com> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com> Signed-off-by: Cheng Jian <cj.chengjian@huawei.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 3a151ff commit 9125258

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/kprobes.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,6 +1972,10 @@ int register_kretprobe(struct kretprobe *rp)
19721972
if (!kprobe_on_func_entry(rp->kp.addr, rp->kp.symbol_name, rp->kp.offset))
19731973
return -EINVAL;
19741974

1975+
/* If only rp->kp.addr is specified, check reregistering kprobes */
1976+
if (rp->kp.addr && check_kprobe_rereg(&rp->kp))
1977+
return -EINVAL;
1978+
19751979
if (kretprobe_blacklist_size) {
19761980
addr = kprobe_addr(&rp->kp);
19771981
if (IS_ERR(addr))

0 commit comments

Comments
 (0)