leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds 2017-10-22 06:39:58 -04:00
commit b8d389e8f3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/objtool/check.c
View File

@ -267,12 +267,13 @@ static int decode_instructions(struct objtool_file *file)
&insn->immediate, &insn->immediate,
&insn->stack_op); &insn->stack_op);
if (ret) if (ret)
return ret; goto err;
if (!insn->type || insn->type > INSN_LAST) { if (!insn->type || insn->type > INSN_LAST) {
WARN_FUNC("invalid instruction type %d", WARN_FUNC("invalid instruction type %d",
insn->sec, insn->offset, insn->type); insn->sec, insn->offset, insn->type);
return -1; ret = -1;
goto err;
} }
hash_add(file->insn_hash, &insn->hash, insn->offset); hash_add(file->insn_hash, &insn->hash, insn->offset);
@ -296,6 +297,10 @@ static int decode_instructions(struct objtool_file *file)
} }
return 0; return 0;
err:
free(insn);
return ret;
} }
/* /*