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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <28DFA0E7-0761-4664-86DA-4ABD5902E95E@zytor.com>
Date:   Mon, 27 Sep 2021 00:36:12 -0700
From:   "H. Peter Anvin" <hpa@...or.com>
To:     Ian Rogers <irogers@...gle.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
        x86@...nel.org, "Peter Zijlstra (Intel)" <peterz@...radead.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Josh Poimboeuf <jpoimboe@...hat.com>,
        linux-kernel@...r.kernel.org,
        Adrian Hunter <adrian.hunter@...el.com>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        David Laight <David.Laight@...lab.com>
CC:     Numfor Mbiziwo-Tiapo <nums@...gle.com>
Subject: Re: [PATCH v4] x86/insn, tools/x86: Fix some potential undefined behavior.

We have get_unaligned() for a reason.

On September 23, 2021 9:18:43 AM PDT, Ian Rogers <irogers@...gle.com> wrote:
>From: Numfor Mbiziwo-Tiapo <nums@...gle.com>
>
>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@google.com/
>
>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@...nel.org>
>
>Signed-off-by: Ian Rogers <irogers@...gle.com>
>Signed-off-by: Numfor Mbiziwo-Tiapo <nums@...gle.com>
>Acked-by: Masami Hiramatsu <mhiramat@...nel.org>
>---
> 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.