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

Commit 13fbe991 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fix from Thomas Gleixner:
 "A single robustness fix for objtool to handle unbalanced CLAC
  invocations under all circumstances"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Improve UACCESS coverage
parents 88c50834 882a0db9

tools/objtool/check.c

+4 −3
Original line number Diff line number Diff line
@@ -1946,6 +1946,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, 
	struct alternative *alt;

	struct instruction *insn, *next_insn;

	struct section *sec;

	u8 visited;

	int ret;



	insn = first;
@@ -1972,12 +1973,12 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, 
			return 1;

		}



		visited = 1 << state.uaccess;

		if (insn->visited) {

			if (!insn->hint && !insn_state_match(insn, &state))

				return 1;



			/* If we were here with AC=0, but now have AC=1, go again */

			if (insn->state.uaccess || !state.uaccess)

			if (insn->visited & visited)

				return 0;

		}
@@ -2024,7 +2025,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, 
		} else

			insn->state = state;



		insn->visited = true;

		insn->visited |= visited;



		if (!insn->ignore_alts) {

			bool skip_orig = false;

tools/objtool/check.h

+2 −1
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ struct instruction { 
	unsigned int len;

	enum insn_type type;

	unsigned long immediate;

	bool alt_group, visited, dead_end, ignore, hint, save, restore, ignore_alts;

	bool alt_group, dead_end, ignore, hint, save, restore, ignore_alts;

	bool retpoline_safe;

	u8 visited;

	struct symbol *call_dest;

	struct instruction *jump_dest;

	struct instruction *first_jump_src;