Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 993bd0de authored by Li Qiang's avatar Li Qiang Committed by Greg Kroah-Hartman
Browse files

kprobe: reverse kp->flags when arm_kprobe failed 

commit 4a6f316d6855a434f56dbbeba05e14c01acde8f8 upstream.

In aggregate kprobe case, when arm_kprobe failed,
we need set the kp->flags with KPROBE_FLAG_DISABLED again.
If not, the 'kp' kprobe will been considered as enabled
but it actually not enabled.

Link: https://lore.kernel.org/all/20220902155820.34755-1-liq3ea@163.com/



Fixes: 12310e34 ("kprobes: Propagate error from arm_kprobe_ftrace()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLi Qiang <liq3ea@163.com>
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe3da744

kernel/kprobes.c

+4 −1
Original line number Diff line number Diff line
@@ -2199,8 +2199,11 @@ int enable_kprobe(struct kprobe *kp) 
	if (!kprobes_all_disarmed && kprobe_disabled(p)) {

		p->flags &= ~KPROBE_FLAG_DISABLED;

		ret = arm_kprobe(p);

		if (ret)

		if (ret) {

			p->flags |= KPROBE_FLAG_DISABLED;

			if (p != kp)

				kp->flags |= KPROBE_FLAG_DISABLED;

		}

	}

out:

	mutex_unlock(&kprobe_mutex);