Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86-64, mm: Initialize VDSO earlier on 64 bits

When initrd is in use and a driver does request_module() in its
module_init (i.e. __initcall or device_initcall), a modprobe process
is created with VDSO mapping. But VDSO is inited even in __initcall,
i.e. on the same level (at the same time), so it may not be inited
yet (link order matters).

Move the VDSO initialization code earlier by switching to something
before rootfs_initcall where initrd is loaded as rootfs. Specifically
to subsys_initcall. Do it for standard 64-bit path (init_vdso_vars)
and for compat (sysenter_setup), just in case people have 32-bit
initrd and ia32 emulation built-in.

i386 (pure 32-bit) is not affected, since sysenter_setup() is called
from check_bugs()->identify_boot_cpu() in start_kernel() before
rest_init()->kernel_thread(kernel_init) where even kernel_init() calls
do_basic_setup()->do_initcalls().

What this patch fixes are early modprobe crashes such as:
Unpacking initramfs...
Freeing initrd memory: 9324k freed
modprobe[368]: segfault at 7fff4429c020 ip 00007fef397e160c \
sp 00007fff442795c0 error 4 in ld-2.11.2.so[7fef397df000+1f000]

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
LKML-Reference: <1276720242-13365-1-git-send-email-jslaby@suse.cz>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

authored by

Jiri Slaby and committed by
H. Peter Anvin
d7a0380d 8b8f79b9

+2 -2
+1 -1
arch/x86/vdso/vdso32-setup.c
··· 374 374 375 375 #ifdef CONFIG_X86_64 376 376 377 - __initcall(sysenter_setup); 377 + subsys_initcall(sysenter_setup); 378 378 379 379 #ifdef CONFIG_SYSCTL 380 380 /* Register vsyscall32 into the ABI table */
+1 -1
arch/x86/vdso/vma.c
··· 74 74 vdso_enabled = 0; 75 75 return -ENOMEM; 76 76 } 77 - __initcall(init_vdso_vars); 77 + subsys_initcall(init_vdso_vars); 78 78 79 79 struct linux_binprm; 80 80