File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -1616,12 +1616,14 @@ static struct kprobe *__disable_kprobe(struct kprobe *p)
16161616 /* Try to disarm and disable this/parent probe */
16171617 if (p == orig_p || aggr_kprobe_disabled (orig_p )) {
16181618 /*
1619- * If kprobes_all_disarmed is set, orig_p
1620- * should have already been disarmed, so
1621- * skip unneed disarming process.
1619+ * Don't be lazy here. Even if 'kprobes_all_disarmed'
1620+ * is false, 'orig_p' might not have been armed yet.
1621+ * Note arm_all_kprobes() __tries__ to arm all kprobes
1622+ * on the best effort basis.
16221623 */
1623- if (!kprobes_all_disarmed )
1624+ if (!kprobes_all_disarmed && ! kprobe_disabled ( orig_p ) )
16241625 disarm_kprobe (orig_p , true);
1626+
16251627 orig_p -> flags |= KPROBE_FLAG_DISABLED ;
16261628 }
16271629 }
You can’t perform that action at this time.
0 commit comments