From:   =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>
To:     guoren@kernel.org, guoren@kernel.org, palmer@rivosinc.com,
        conor.dooley@microchip.com, liaochang1@huawei.com
Cc:     linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-riscv@lists.infradead.org,
        Guo Ren <guoren@linux.alibaba.com>,
        Bjorn Topel <bjorn.topel@gmail.com>
Subject: Re: [PATCH] riscv: kprobe: Fixup misaligned load text
In-Reply-To: <20230201064608.3486136-1-guoren@kernel.org>
References: <20230201064608.3486136-1-guoren@kernel.org>
Date:   Wed, 01 Feb 2023 10:40:12 +0100
Message-ID: <87tu05pvur.fsf@all.your.base.are.belong.to.us>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

guoren@kernel.org writes:

> From: Guo Ren <guoren@linux.alibaba.com>
>
> The current kprobe would cause a misaligned load for the probe point.
> This patch fixup it with two half-word loads instead.
>
> Fixes: c22b0bcb1dd0 ("riscv: Add kprobes supported")
> Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> Signed-off-by: Guo Ren <guoren@kernel.org>
> Link: https://lore.kernel.org/linux-riscv/878rhig9zj.fsf@all.your.base.are.belong.to.us/
> Reported-by: Bjorn Topel <bjorn.topel@gmail.com>
> ---
>  arch/riscv/kernel/probes/kprobes.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c
> index 41c7481afde3..c1160629cef4 100644
> --- a/arch/riscv/kernel/probes/kprobes.c
> +++ b/arch/riscv/kernel/probes/kprobes.c
> @@ -74,7 +74,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
>  		return -EILSEQ;
>  
>  	/* copy instruction */
> -	p->opcode = *p->addr;
> +	p->opcode = (kprobe_opcode_t)(*(u16 *)probe_addr);
> +	if (GET_INSN_LENGTH(p->opcode) == 4)
> +		p->opcode |= (kprobe_opcode_t)(*(u16 *)(probe_addr + 2))
>  	<< 16;

Ugh, those casts. :-( What about the memcpy variant you had in the other
thread?