From:   =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>
To:     Guo Ren <guoren@kernel.org>
Cc:     palmer@dabbelt.com, paul.walmsley@sifive.com, mhiramat@kernel.org,
        conor.dooley@microchip.com, penberg@kernel.org,
        mark.rutland@arm.com, liaochang <liaochang1@huawei.com>,
        linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
        Guo Ren <guoren@linux.alibaba.com>
Subject: Re: [PATCH] riscv: kprobe: Fixup kernel panic when probing an
 illegal position
In-Reply-To: <CAJF2gTQHDmT=XWE=j8+5Y5ogKh4qNMpXCwAa+7wXEkBit0ujXw@mail.gmail.com>
References: <20230126130509.1418251-1-guoren@kernel.org>
 <878rhig9zj.fsf@all.your.base.are.belong.to.us>
 <CAJF2gTQHDmT=XWE=j8+5Y5ogKh4qNMpXCwAa+7wXEkBit0ujXw@mail.gmail.com>
Date:   Wed, 01 Feb 2023 10:30:14 +0100
Message-ID: <87357pravt.fsf@all.your.base.are.belong.to.us>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Guo Ren <guoren@kernel.org> writes:

>> > +     if (!arch_check_kprobe(p))
>> > +             return -EILSEQ;
>> > +
>> >       /* copy instruction */
>> >       p->opcode =3D *p->addr;
>>
>> Not related to your patch, but this can also trigger a misaligned load.
> After rereading the spec, misaligned load/store is not mandatory
> supported. (Although my machines and qemu are correct)

Yes. It would be great if it could be turned on by QEMU (you can with
Spike).

> So I need fixup:
>
> diff --git a/arch/riscv/kernel/probes/kprobes.c
> b/arch/riscv/kernel/probes/kprobes.c
> index 27f8960c321c..0c016d496746 100644
> --- a/arch/riscv/kernel/probes/kprobes.c
> +++ b/arch/riscv/kernel/probes/kprobes.c
> @@ -58,12 +58,14 @@ static bool __kprobes arch_check_kprobe(struct kprobe=
 *p)
>  {
>         unsigned long tmp  =3D (unsigned long)p->addr - p->offset;
>         unsigned long addr =3D (unsigned long)p->addr;
> +       kprobe_opcode_t opcode;
>
>         while (tmp <=3D addr) {
>                 if (tmp =3D=3D addr)
>                         return true;
>
> -               tmp +=3D GET_INSN_LENGTH(*(kprobe_opcode_t *)tmp);
> +               memcpy(&opcode, (void *)tmp, sizeof(kprobe_opcode_t));
> +               tmp +=3D GET_INSN_LENGTH(opcode);

I'd prefer sizeof(opcode).

>         }
>
>         return false;
> @@ -80,7 +82,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
>                 return -EILSEQ;
>
>         /* copy instruction */
> -       p->opcode =3D *p->addr;
> +       memcpy(&p->opcode, p->addr, sizeof(kprobe_opcode_t));

Same comment as above, and this would ideally be a separate patch.


Bj=C3=B6rn