Commit 91b7a0f0 authored May 15, 2021 by Linus Torvalds

Merge tag 'core-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 stack randomization fix from Ingo Molnar:
 "Fix an assembly constraint that affected LLVM up to version 12"

* tag 'core-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  stack: Replace "o" output with "r" input constraint

parents a4147415 2515dd6c

include/linux/randomize_kstack.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ void *__builtin_alloca(size_t size);
		u32 offset = raw_cpu_read(kstack_offset); \
		u8 *ptr = __builtin_alloca(KSTACK_OFFSET_MAX(offset)); \
		/* Keep allocation even after "ptr" loses scope. */ \
		asm volatile("" : "=o"(*ptr) :: "memory"); \
		asm volatile("" :: "r"(ptr) : "memory"); \
		} \
		} while (0)