Commit b8d389e8 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:
 "Plug a memory leak in the instruction decoder"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix memory leak in decode_instructions()
parents b5ac3beb b7037983

tools/objtool/check.c

+7 −2
Original line number Diff line number Diff line
@@ -267,12 +267,13 @@ static int decode_instructions(struct objtool_file *file) 
						      &insn->immediate,

						      &insn->stack_op);

			if (ret)

				return ret;

				goto err;



			if (!insn->type || insn->type > INSN_LAST) {

				WARN_FUNC("invalid instruction type %d",

					  insn->sec, insn->offset, insn->type);

				return -1;

				ret = -1;

				goto err;

			}



			hash_add(file->insn_hash, &insn->hash, insn->offset);
@@ -296,6 +297,10 @@ static int decode_instructions(struct objtool_file *file) 
	}



	return 0;



err:

	free(insn);

	return ret;

}



/*