Commit 08a6b55a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2024-06-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:

 - Fix the 8 bytes get_user() logic on x86-32

 - Fix build bug that creates weird & mistaken target directory under
   arch/x86/

* tag 'x86-urgent-2024-06-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Don't add the EFI stub to targets, again
  x86/uaccess: Fix missed zeroing of ia32 u64 get_user() range checking
parents 41d70722 b2747f10

arch/x86/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o 


vmlinux-objs-$(CONFIG_EFI) += $(obj)/efi.o

vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_mixed.o

vmlinux-objs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

vmlinux-libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a



$(obj)/vmlinux: $(vmlinux-objs-y) FORCE

$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE

	$(call if_changed,ld)



OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S

arch/x86/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ extern int __get_user_bad(void); 
	int __ret_gu;							\

	register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX);		\

	__chk_user_ptr(ptr);						\

	asm volatile("call __" #fn "_%c4"				\

	asm volatile("call __" #fn "_%c[size]"				\

		     : "=a" (__ret_gu), "=r" (__val_gu),		\

			ASM_CALL_CONSTRAINT				\

		     : "0" (ptr), "i" (sizeof(*(ptr))));		\

		     : "0" (ptr), [size] "i" (sizeof(*(ptr))));		\

	instrument_get_user(__val_gu);					\

	(x) = (__force __typeof__(*(ptr))) __val_gu;			\

	__builtin_expect(__ret_gu, 0);					\

arch/x86/lib/getuser.S

+5 −1
Original line number Diff line number Diff line
@@ -44,7 +44,11 @@ 
	or %rdx, %rax

.else

	cmp $TASK_SIZE_MAX-\size+1, %eax

.if \size != 8

	jae .Lbad_get_user

.else

	jae .Lbad_get_user_8

.endif

	sbb %edx, %edx		/* array_index_mask_nospec() */

	and %edx, %eax

.endif
@@ -154,7 +158,7 @@ SYM_CODE_END(__get_user_handle_exception) 
#ifdef CONFIG_X86_32

SYM_CODE_START_LOCAL(__get_user_8_handle_exception)

	ASM_CLAC

bad_get_user_8:

.Lbad_get_user_8:

	xor %edx,%edx

	xor %ecx,%ecx

	mov $(-EFAULT),%_ASM_AX