Commit d7a0380d authored Jun 16, 2010 by Jiri Slaby Committed by H. Peter Anvin Jun 18, 2010

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>

parent 8b8f79b9

arch/x86/vdso/vdso32-setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -374,7 +374,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)

		#ifdef CONFIG_X86_64

		__initcall(sysenter_setup);
		subsys_initcall(sysenter_setup);

		#ifdef CONFIG_SYSCTL
		/* Register vsyscall32 into the ABI table */

arch/x86/vdso/vma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ static int __init init_vdso_vars(void)
		vdso_enabled = 0;
		return -ENOMEM;
		}
		__initcall(init_vdso_vars);
		subsys_initcall(init_vdso_vars);

		struct linux_binprm;

Admin message