Re: [PATCH] kprobe: reverse kp->flags when arm_kprobe failed

[Li Qiang]

Kindly ping.

Li Qiang <liq3ea@xxxxxxx> 于2022年9月3日周六 00:00写道：
>
> 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.
>
> Signed-off-by: Li Qiang <liq3ea@xxxxxxx>
> ---
>  kernel/kprobes.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 08350e35a..333454df5 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -2424,8 +2424,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);
> --
> 2.25.1
>