We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 6a27997 commit 55c7a91Copy full SHA for 55c7a91
kernel/kprobes.c
@@ -1705,11 +1705,12 @@ static struct kprobe *__disable_kprobe(struct kprobe *p)
1705
/* Try to disarm and disable this/parent probe */
1706
if (p == orig_p || aggr_kprobe_disabled(orig_p)) {
1707
/*
1708
- * If kprobes_all_disarmed is set, orig_p
1709
- * should have already been disarmed, so
1710
- * skip unneed disarming process.
+ * Don't be lazy here. Even if 'kprobes_all_disarmed'
+ * is false, 'orig_p' might not have been armed yet.
+ * Note arm_all_kprobes() __tries__ to arm all kprobes
1711
+ * on the best effort basis.
1712
*/
- if (!kprobes_all_disarmed) {
1713
+ if (!kprobes_all_disarmed && !kprobe_disabled(orig_p)) {
1714
ret = disarm_kprobe(orig_p, true);
1715
if (ret) {
1716
p->flags &= ~KPROBE_FLAG_DISABLED;
0 commit comments