2022-09-08 02:01:56

by Tiezhu Yang

Subject: [PATCH] riscv: kprobes: Free instruction in arch_remove_kprobe()

Call free_insn_slot() to free instruction in arch_remove_kprobe()
as other arches do.

Signed-off-by: Tiezhu Yang <[email protected]>
---
arch/riscv/kernel/probes/kprobes.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c
index e6e950b..f12eb1f 100644
--- a/arch/riscv/kernel/probes/kprobes.c
+++ b/arch/riscv/kernel/probes/kprobes.c
@@ -110,6 +110,10 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)

void __kprobes arch_remove_kprobe(struct kprobe *p)
{
+ if (p->ainsn.api.insn) {
+ free_insn_slot(p->ainsn.api.insn, 0);
+ p->ainsn.api.insn = NULL;
+ }
}

static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
--
2.1.0

2022-09-08 02:59:26

by Liao, Chang

Subject: Re: [PATCH] riscv: kprobes: Free instruction in arch_remove_kprobe()

Hi, Tiezhu,

This bug is fixed already, see https://lore.kernel.org/all/[email protected]/T/

在 2022/9/8 9:39, Tiezhu Yang 写道:
> Call free_insn_slot() to free instruction in arch_remove_kprobe()
> as other arches do.
>
> Signed-off-by: Tiezhu Yang <[email protected]>
> ---
> arch/riscv/kernel/probes/kprobes.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c
> index e6e950b..f12eb1f 100644
> --- a/arch/riscv/kernel/probes/kprobes.c
> +++ b/arch/riscv/kernel/probes/kprobes.c
> @@ -110,6 +110,10 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
>
> void __kprobes arch_remove_kprobe(struct kprobe *p)
> {
> + if (p->ainsn.api.insn) {
> + free_insn_slot(p->ainsn.api.insn, 0);
> + p->ainsn.api.insn = NULL;
> + }
> }
>
> static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)

--
BR,
Liao, Chang