Commit 19bf2e0e 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 fix to the objtool sibling call detection logic to distinguish
  normal jumps inside a function from a real sibling call"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix sibling call detection logic
parents bc2c6421 4855022a

tools/objtool/check.c

+11 −2
Original line number Diff line number Diff line
@@ -1371,6 +1371,12 @@ static int validate_branch(struct objtool_file *file, struct instruction *first, 


		func = insn->func;



		if (func && insn->ignore) {

			WARN_FUNC("BUG: why am I validating an ignored function?",

				  sec, insn->offset);

			return -1;

		}



		if (insn->visited) {

			if (!!insn_state_match(insn, &state))

				return 1;
@@ -1426,16 +1432,19 @@ static int validate_branch(struct objtool_file *file, struct instruction *first, 


		case INSN_JUMP_CONDITIONAL:

		case INSN_JUMP_UNCONDITIONAL:

			if (insn->jump_dest) {

			if (insn->jump_dest &&

			    (!func || !insn->jump_dest->func ||

			     func == insn->jump_dest->func)) {

				ret = validate_branch(file, insn->jump_dest,

						      state);

				if (ret)

					return 1;



			} else if (func && has_modified_stack_frame(&state)) {

				WARN_FUNC("sibling call from callable instruction with modified stack frame",

					  sec, insn->offset);

				return 1;

			} /* else it's a sibling call */

			}



			if (insn->type == INSN_JUMP_UNCONDITIONAL)

				return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE