[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241015082905.GA1235948@thelio-3990X>
Date: Tue, 15 Oct 2024 01:29:05 -0700
From: Nathan Chancellor <nathan@...nel.org>
To: Mike Rapoport <rppt@...nel.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Andreas Larsson <andreas@...sler.com>,
Andy Lutomirski <luto@...nel.org>, Ard Biesheuvel <ardb@...nel.org>,
Arnd Bergmann <arnd@...db.de>, Borislav Petkov <bp@...en8.de>,
Brian Cain <bcain@...cinc.com>,
Catalin Marinas <catalin.marinas@....com>,
Christoph Hellwig <hch@...radead.org>,
Christophe Leroy <christophe.leroy@...roup.eu>,
Dave Hansen <dave.hansen@...ux.intel.com>,
Dinh Nguyen <dinguyen@...nel.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Guo Ren <guoren@...nel.org>, Helge Deller <deller@....de>,
Huacai Chen <chenhuacai@...nel.org>, Ingo Molnar <mingo@...hat.com>,
Johannes Berg <johannes@...solutions.net>,
John Paul Adrian Glaubitz <glaubitz@...sik.fu-berlin.de>,
Kent Overstreet <kent.overstreet@...ux.dev>,
"Liam R. Howlett" <Liam.Howlett@...cle.com>,
Luis Chamberlain <mcgrof@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Masami Hiramatsu <mhiramat@...nel.org>,
Matt Turner <mattst88@...il.com>, Max Filippov <jcmvbkbc@...il.com>,
Michael Ellerman <mpe@...erman.id.au>,
Michal Simek <monstr@...str.eu>, Oleg Nesterov <oleg@...hat.com>,
Palmer Dabbelt <palmer@...belt.com>,
Peter Zijlstra <peterz@...radead.org>,
Richard Weinberger <richard@....at>,
Russell King <linux@...linux.org.uk>, Song Liu <song@...nel.org>,
Stafford Horne <shorne@...il.com>,
Steven Rostedt <rostedt@...dmis.org>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Thomas Gleixner <tglx@...utronix.de>,
Uladzislau Rezki <urezki@...il.com>,
Vineet Gupta <vgupta@...nel.org>, Will Deacon <will@...nel.org>,
bpf@...r.kernel.org, linux-alpha@...r.kernel.org,
linux-arch@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-csky@...r.kernel.org, linux-hexagon@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-m68k@...ts.linux-m68k.org,
linux-mips@...r.kernel.org, linux-mm@...ck.org,
linux-modules@...r.kernel.org, linux-openrisc@...r.kernel.org,
linux-parisc@...r.kernel.org, linux-riscv@...ts.infradead.org,
linux-sh@...r.kernel.org, linux-snps-arc@...ts.infradead.org,
linux-trace-kernel@...r.kernel.org, linux-um@...ts.infradead.org,
linuxppc-dev@...ts.ozlabs.org, loongarch@...ts.linux.dev,
sparclinux@...r.kernel.org, x86@...nel.org
Subject: Re: [PATCH v5 6/8] x86/module: perpare module loading for ROX
allocations of text
On Fri, Oct 11, 2024 at 03:58:04PM +0300, Mike Rapoport wrote:
> I overlooked how cfi_*_callers routines update addr.
> This patch should fix it:
Thanks, can confirm. My boot is working again and LKDTM's
CFI_FORWARD_PROTO test properly fails.
> diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> index 3b3fa93af3b1..cf782f431110 100644
> --- a/arch/x86/kernel/alternative.c
> +++ b/arch/x86/kernel/alternative.c
> @@ -1148,11 +1148,13 @@ static int cfi_disable_callers(s32 *start, s32 *end, struct module *mod)
>
> for (s = start; s < end; s++) {
> void *addr = (void *)s + *s;
> - void *wr_addr = module_writable_address(mod, addr);
> + void *wr_addr;
> u32 hash;
>
> addr -= fineibt_caller_size;
> - hash = decode_caller_hash(addr);
> + wr_addr = module_writable_address(mod, addr);
> + hash = decode_caller_hash(wr_addr);
> +
> if (!hash) /* nocfi callers */
> continue;
>
> @@ -1172,11 +1174,12 @@ static int cfi_enable_callers(s32 *start, s32 *end, struct module *mod)
>
> for (s = start; s < end; s++) {
> void *addr = (void *)s + *s;
> - void *wr_addr = module_writable_address(mod, addr);
> + void *wr_addr;
> u32 hash;
>
> addr -= fineibt_caller_size;
> - hash = decode_caller_hash(addr);
> + wr_addr = module_writable_address(mod, addr);
> + hash = decode_caller_hash(wr_addr);
> if (!hash) /* nocfi callers */
> continue;
>
> @@ -1249,11 +1252,12 @@ static int cfi_rand_callers(s32 *start, s32 *end, struct module *mod)
>
> for (s = start; s < end; s++) {
> void *addr = (void *)s + *s;
> - void *wr_addr = module_writable_address(mod, addr);
> + void *wr_addr;
> u32 hash;
>
> addr -= fineibt_caller_size;
> - hash = decode_caller_hash(addr);
> + wr_addr = module_writable_address(mod, addr);
> + hash = decode_caller_hash(wr_addr);
> if (hash) {
> hash = -cfi_rehash(hash);
> text_poke_early(wr_addr + 2, &hash, 4);
> @@ -1269,14 +1273,15 @@ static int cfi_rewrite_callers(s32 *start, s32 *end, struct module *mod)
>
> for (s = start; s < end; s++) {
> void *addr = (void *)s + *s;
> - void *wr_addr = module_writable_address(mod, addr);
> + void *wr_addr;
> u32 hash;
>
> addr -= fineibt_caller_size;
> - hash = decode_caller_hash(addr);
> + wr_addr = module_writable_address(mod, addr);
> + hash = decode_caller_hash(wr_addr);
> if (hash) {
> text_poke_early(wr_addr, fineibt_caller_start, fineibt_caller_size);
> - WARN_ON(*(u32 *)(addr + fineibt_caller_hash) != 0x12345678);
> + WARN_ON(*(u32 *)(wr_addr + fineibt_caller_hash) != 0x12345678);
> text_poke_early(wr_addr + fineibt_caller_hash, &hash, 4);
> }
> /* rely on apply_retpolines() */
>
> > Cheers,
> > Nathan
>
> --
> Sincerely yours,
> Mike.
Powered by blists - more mailing lists