Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab8b82ee authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/compat: Don't build the 32-bit VDSO if not needed 



Build the 32-bit vdso only for native 32-bit or 32-bit compat is
enabled.  x32 should not force it to build.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1434974121-32575-7-git-send-email-brgerst@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 601275c3

arch/x86/entry/vdso/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ KASAN_SANITIZE := n 
VDSO64-$(CONFIG_X86_64)		:= y

VDSOX32-$(CONFIG_X86_X32_ABI)	:= y

VDSO32-$(CONFIG_X86_32)		:= y

VDSO32-$(CONFIG_COMPAT)		:= y

VDSO32-$(CONFIG_IA32_EMULATION)	:= y



# files to link into the vdso

vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o
@@ -20,7 +20,7 @@ obj-y += vma.o 
vdso_img-$(VDSO64-y)		+= 64

vdso_img-$(VDSOX32-y)		+= x32

vdso_img-$(VDSO32-y)		+= 32-int80

vdso_img-$(CONFIG_COMPAT)	+= 32-syscall

vdso_img-$(CONFIG_IA32_EMULATION)	+= 32-syscall

vdso_img-$(VDSO32-y)		+= 32-sysenter



obj-$(VDSO32-y)			+= vdso32-setup.o
@@ -126,7 +126,7 @@ $(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE 
# Build multiple 32-bit vDSO images to choose from at boot time.

#

vdso32.so-$(VDSO32-y)		+= int80

vdso32.so-$(CONFIG_COMPAT)	+= syscall

vdso32.so-$(CONFIG_IA32_EMULATION)	+= syscall

vdso32.so-$(VDSO32-y)		+= sysenter



vdso32-images			= $(vdso32.so-y:%=vdso32-%.so)

arch/x86/entry/vdso/vma.c

+5 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr) 
	return ret;

}



#if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)

#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)

static int load_vdso32(void)

{

	int ret;
@@ -219,8 +219,11 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm, 
		return map_vdso(&vdso_image_x32, true);

	}

#endif



#ifdef CONFIG_IA32_EMULATION

	return load_vdso32();

#else

	return 0;

#endif

}

#endif

#else

arch/x86/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ typedef struct user_fxsr_struct elf_fpxregset_t; 
#ifdef CONFIG_X86_64

extern unsigned int vdso64_enabled;

#endif

#if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)

#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)

extern unsigned int vdso32_enabled;

#endif