Re: [PATCH v4] x86/insn, tools/x86: Fix some potential undefined behavior.

[H. Peter Anvin]

We have get_unaligned() for a reason.

On September 23, 2021 9:18:43 AM PDT, Ian Rogers <irogers@xxxxxxxxxx> wrote:
>From: Numfor Mbiziwo-Tiapo <nums@xxxxxxxxxx>
>
>Don't perform unaligned loads in __get_next and __peek_nbyte_next as
>these are forms of undefined behavior.
>
>These problems were identified using the undefined behavior sanitizer
>(ubsan) with the tools version of the code and perf test. Part of this
>patch was previously posted here:
>https://lore.kernel.org/lkml/20190724184512.162887-4-nums@xxxxxxxxxx/
>
>v4. Fixes a typo.
>
>v3. Is a rebase picking up a fix for big endian architectures.
>
>v2. removes the validate_next check and merges the 2 changes into one as
>requested by Masami Hiramatsu <mhiramat@xxxxxxxxxx>
>
>Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
>Signed-off-by: Numfor Mbiziwo-Tiapo <nums@xxxxxxxxxx>
>Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
>---
> arch/x86/lib/insn.c       | 4 ++--
> tools/arch/x86/lib/insn.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
>index 058f19b20465..c565def611e2 100644
>--- a/arch/x86/lib/insn.c
>+++ b/arch/x86/lib/insn.c
>@@ -37,10 +37,10 @@
> 	((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)
> 
> #define __get_next(t, insn)	\
>-	({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })
>+	({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })
> 
> #define __peek_nbyte_next(t, insn, n)	\
>-	({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); })
>+	({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); })
> 
> #define get_next(t, insn)	\
> 	({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); })
>diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c
>index c41f95815480..797699462cd8 100644
>--- a/tools/arch/x86/lib/insn.c
>+++ b/tools/arch/x86/lib/insn.c
>@@ -37,10 +37,10 @@
> 	((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)
> 
> #define __get_next(t, insn)	\
>-	({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })
>+	({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })
> 
> #define __peek_nbyte_next(t, insn, n)	\
>-	({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); })
>+	({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); })
> 
> #define get_next(t, insn)	\
> 	({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); })

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.