From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752487AbdJTHtb (ORCPT ); Fri, 20 Oct 2017 03:49:31 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47243 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752449AbdJTHt2 (ORCPT ); Fri, 20 Oct 2017 03:49:28 -0400 Date: Fri, 20 Oct 2017 00:45:46 -0700 From: tip-bot for Kamalesh Babulal Message-ID: Cc: jpoimboe@redhat.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org, kamalesh@linux.vnet.ibm.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, kamalesh@linux.vnet.ibm.com In-Reply-To: <336da800bf6070eae11f4e0a3b9ca64c27658114.1508430423.git.jpoimboe@redhat.com> References: <336da800bf6070eae11f4e0a3b9ca64c27658114.1508430423.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/urgent] objtool: Fix memory leak in decode_instructions() Git-Commit-ID: b703798386fb7288d5a995bd2284a984a5e24f3c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b703798386fb7288d5a995bd2284a984a5e24f3c Gitweb: https://git.kernel.org/tip/b703798386fb7288d5a995bd2284a984a5e24f3c Author: Kamalesh Babulal AuthorDate: Thu, 19 Oct 2017 11:27:24 -0500 Committer: Ingo Molnar CommitDate: Fri, 20 Oct 2017 09:43:21 +0200 objtool: Fix memory leak in decode_instructions() When an error occurs before adding an allocated insn to the list, free it before returning. Signed-off-by: Kamalesh Babulal Signed-off-by: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/336da800bf6070eae11f4e0a3b9ca64c27658114.1508430423.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- tools/objtool/check.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index a0c518e..c0e26ad 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -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; } /*