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
| ||
|
Message-ID: <20231005052824.GE3303@kernel.org> Date: Thu, 5 Oct 2023 08:28:24 +0300 From: Mike Rapoport <rppt@...nel.org> To: "Edgecombe, Rick P" <rick.p.edgecombe@...el.com> Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "tglx@...utronix.de" <tglx@...utronix.de>, "deller@....de" <deller@....de>, "mcgrof@...nel.org" <mcgrof@...nel.org>, "bjorn@...nel.org" <bjorn@...nel.org>, "davem@...emloft.net" <davem@...emloft.net>, "nadav.amit@...il.com" <nadav.amit@...il.com>, "linux@...linux.org.uk" <linux@...linux.org.uk>, "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "linux-mips@...r.kernel.org" <linux-mips@...r.kernel.org>, "linux-riscv@...ts.infradead.org" <linux-riscv@...ts.infradead.org>, "hca@...ux.ibm.com" <hca@...ux.ibm.com>, "catalin.marinas@....com" <catalin.marinas@....com>, "kent.overstreet@...ux.dev" <kent.overstreet@...ux.dev>, "puranjay12@...il.com" <puranjay12@...il.com>, "palmer@...belt.com" <palmer@...belt.com>, "linux-s390@...r.kernel.org" <linux-s390@...r.kernel.org>, "chenhuacai@...nel.org" <chenhuacai@...nel.org>, "tsbogend@...ha.franken.de" <tsbogend@...ha.franken.de>, "linux-trace-kernel@...r.kernel.org" <linux-trace-kernel@...r.kernel.org>, "mpe@...erman.id.au" <mpe@...erman.id.au>, "linux-parisc@...r.kernel.org" <linux-parisc@...r.kernel.org>, "x86@...nel.org" <x86@...nel.org>, "mark.rutland@....com" <mark.rutland@....com>, "christophe.leroy@...roup.eu" <christophe.leroy@...roup.eu>, "linuxppc-dev@...ts.ozlabs.org" <linuxppc-dev@...ts.ozlabs.org>, "rostedt@...dmis.org" <rostedt@...dmis.org>, "will@...nel.org" <will@...nel.org>, "dinguyen@...nel.org" <dinguyen@...nel.org>, "naveen.n.rao@...ux.ibm.com" <naveen.n.rao@...ux.ibm.com>, "sparclinux@...r.kernel.org" <sparclinux@...r.kernel.org>, "linux-modules@...r.kernel.org" <linux-modules@...r.kernel.org>, "bpf@...r.kernel.org" <bpf@...r.kernel.org>, "linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, "song@...nel.org" <song@...nel.org>, "linux-mm@...ck.org" <linux-mm@...ck.org>, "loongarch@...ts.linux.dev" <loongarch@...ts.linux.dev>, "akpm@...ux-foundation.org" <akpm@...ux-foundation.org> Subject: Re: [PATCH v3 04/13] mm/execmem, arch: convert remaining overrides of module_alloc to execmem On Wed, Oct 04, 2023 at 12:29:36AM +0000, Edgecombe, Rick P wrote: > On Mon, 2023-09-18 at 10:29 +0300, Mike Rapoport wrote: > > diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c > > index 5f71a0cf4399..9d37375e2f05 100644 > > --- a/arch/x86/kernel/module.c > > +++ b/arch/x86/kernel/module.c > > > > -void *module_alloc(unsigned long size) > > +struct execmem_params __init *execmem_arch_params(void) > > { > > - gfp_t gfp_mask = GFP_KERNEL; > > - void *p; > > - > > - if (PAGE_ALIGN(size) > MODULES_LEN) > > - return NULL; > > + unsigned long module_load_offset = 0; > > + unsigned long start; > > > > - p = __vmalloc_node_range(size, MODULE_ALIGN, > > - MODULES_VADDR + > > get_module_load_offset(), > > - MODULES_END, gfp_mask, PAGE_KERNEL, > > - VM_FLUSH_RESET_PERMS | > > VM_DEFER_KMEMLEAK, > > - NUMA_NO_NODE, > > __builtin_return_address(0)); > > + if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_enabled()) > > + module_load_offset = > > + get_random_u32_inclusive(1, 1024) * > > PAGE_SIZE; > > Minor: > I think you can skip the IS_ENABLED(CONFIG_RANDOMIZE_BASE) part because > CONFIG_RANDOMIZE_MEMORY depends on CONFIG_RANDOMIZE_BASE (which is > checked in kaslr_enabled()). Thanks, I'll look into it. -- Sincerely yours, Mike.
Powered by blists - more mailing lists