vmalloc: fix the owner argument for the new __vmalloc_node_range callers
Subsystems (3)
PATCH 1/1 vmalloc: fix the owner argument for the new __vmalloc_node_range callers
Fix the recently added new __vmalloc_node_range callers to pass the correct values as the owner for display in /proc/vmallocinfo.
Fixes 800e26b81311 ("x86/hyperv: allocate the hypercall page with only read and execute bits")
Fixes 10d5e97c1bf8 ("arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page")
Fixes 7a0e27b2a0ce ("mm: remove vmalloc_exec")
Reported-by Ard Biesheuvel <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
--- arch/arm64/kernel/probes/kprobes.c | 2 +- arch/x86/hyperv/hv_init.c | 3 ++- kernel/module.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
arch/arm64/kernel/probes/kprobes.c +1 -1
@@ -122,7 +122,7 @@ void *alloc_insn_page(void) {return __vmalloc_node_range (PAGE_SIZE ,1 ,VMALLOC_START ,VMALLOC_END ,GFP_KERNEL ,PAGE_KERNEL_ROX ,VM_FLUSH_RESET_PERMS , -NUMA_NO_NODE , __func__); +NUMA_NO_NODE ,__builtin_return_address (0 )); }/* arm kprobe: install breakpoint in text */
arch/x86/hyperv/hv_init.c +2 -1
@@ -377,7 +377,8 @@ void __init hyperv_init(void) hv_hypercall_pg =__vmalloc_node_range (PAGE_SIZE ,1 ,VMALLOC_START ,VMALLOC_END ,GFP_KERNEL ,PAGE_KERNEL_ROX , -VM_FLUSH_RESET_PERMS ,NUMA_NO_NODE , __func__); +VM_FLUSH_RESET_PERMS ,NUMA_NO_NODE , +__builtin_return_address (0 ));if (hv_hypercall_pg ==NULL ) {wrmsrl (HV_X64_MSR_GUEST_OS_ID ,0 ); goto remove_cpuhp_state;
kernel/module.c +1 -1
@@ -2785,7 +2785,7 @@ void * __weak module_alloc(unsigned long size) {return __vmalloc_node_range (size,1 ,VMALLOC_START ,VMALLOC_END ,GFP_KERNEL ,PAGE_KERNEL_EXEC ,VM_FLUSH_RESET_PERMS , -NUMA_NO_NODE , __func__); +NUMA_NO_NODE ,__builtin_return_address (0 )); }bool __weak module_init_section (const char *name)
Signature · 1 line
2.26.2