vmalloc: fix the owner argument for the new __vmalloc_node_range callers (a3a66c38) · Commits · 戴 / test

Fix the recently added new __vmalloc_node_range callers to pass the correct values as the owner for display in /proc/vmallocinfo. Fixes: ("x86/hyperv: allocate the hypercall page with only read and execute bits") Fixes: ("arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page") Fixes: ("mm: remove vmalloc_exec") Reported-by:

Ard Biesheuvel <ardb@kernel.org> Signed-off-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Link: http://lkml.kernel.org/r/20200627075649.2455097-1-hch@lst.de Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/arm64/kernel/probes/kprobes.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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)

Admin message