File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -1707,11 +1707,12 @@ static struct kprobe *__disable_kprobe(struct kprobe *p)
17071707 /* Try to disarm and disable this/parent probe */
17081708 if (p == orig_p || aggr_kprobe_disabled (orig_p )) {
17091709 /*
1710- * If 'kprobes_all_disarmed' is set, 'orig_p'
1711- * should have already been disarmed, so
1712- * skip unneed disarming process.
1710+ * Don't be lazy here. Even if 'kprobes_all_disarmed'
1711+ * is false, 'orig_p' might not have been armed yet.
1712+ * Note arm_all_kprobes() __tries__ to arm all kprobes
1713+ * on the best effort basis.
17131714 */
1714- if (!kprobes_all_disarmed ) {
1715+ if (!kprobes_all_disarmed && ! kprobe_disabled ( orig_p ) ) {
17151716 ret = disarm_kprobe (orig_p , true);
17161717 if (ret ) {
17171718 p -> flags &= ~KPROBE_FLAG_DISABLED ;
You can’t perform that action at this time.
0 commit comments