Commit 19469d2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fix from Thomas Gleixner:
 "A single objtool fix to handle the PUSHF/POPF validation correctly for
  the paravirt changes which modified arch_local_irq_restore not to use
  popf"

* tag 'objtool-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool,x86: Fix uaccess PUSHF/POPF validation
parents fa509ff8 ba08abca

arch/x86/include/asm/smap.h

+4 −6
Original line number Diff line number Diff line
@@ -58,9 +58,8 @@ static __always_inline unsigned long smap_save(void) 
	unsigned long flags;



	asm volatile ("# smap_save\n\t"

		      ALTERNATIVE("jmp 1f", "", X86_FEATURE_SMAP)

		      "pushf; pop %0; " __ASM_CLAC "\n\t"

		      "1:"

		      ALTERNATIVE("", "pushf; pop %0; " __ASM_CLAC "\n\t",

				  X86_FEATURE_SMAP)

		      : "=rm" (flags) : : "memory", "cc");



	return flags;
@@ -69,9 +68,8 @@ static __always_inline unsigned long smap_save(void) 
static __always_inline void smap_restore(unsigned long flags)

{

	asm volatile ("# smap_restore\n\t"

		      ALTERNATIVE("jmp 1f", "", X86_FEATURE_SMAP)

		      "push %0; popf\n\t"

		      "1:"

		      ALTERNATIVE("", "push %0; popf\n\t",

				  X86_FEATURE_SMAP)

		      : : "g" (flags) : "memory", "cc");

}

tools/objtool/check.c

+3 −0
Original line number Diff line number Diff line
@@ -2442,6 +2442,9 @@ static int handle_insn_ops(struct instruction *insn, struct insn_state *state) 
		if (update_cfi_state(insn, &state->cfi, op))

			return 1;



		if (!insn->alt_group)

			continue;



		if (op->dest.type == OP_DEST_PUSHF) {

			if (!state->uaccess_stack) {

				state->uaccess_stack = 1;