Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sat, 13 Jul 2019 03:53:06 -0700
From:   tip-bot for Leo Yan <tipbot@zytor.com>
Message-ID: <tip-c74b05030edb3b52f4208d8415b8c933bc509a29@git.kernel.org>
Cc:     adrian.hunter@intel.com, alexander.shishkin@linux.intel.com,
        namhyung@kernel.org, leo.yan@linaro.org, dave@stgolabs.net,
        suzuki.poulose@arm.com, tmricht@linux.ibm.com, jolsa@kernel.org,
        changbin.du@intel.com, tglx@linutronix.de, acme@redhat.com,
        mingo@kernel.org, yao.jin@linux.intel.com, davem@davemloft.net,
        alexios.zavras@intel.com, peterz@infradead.org,
        songliubraving@fb.com, eric.saint.etienne@oracle.com,
        mathieu.poirier@linaro.org, alexey.budankov@linux.intel.com,
        hpa@zytor.com, khlebnikov@yandex-team.ru, ak@linux.intel.com,
        linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org
Reply-To: hpa@zytor.com, khlebnikov@yandex-team.ru, ak@linux.intel.com,
          linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org,
          peterz@infradead.org, songliubraving@fb.com,
          eric.saint.etienne@oracle.com, mathieu.poirier@linaro.org,
          alexey.budankov@linux.intel.com, jolsa@kernel.org,
          changbin.du@intel.com, tglx@linutronix.de, acme@redhat.com,
          yao.jin@linux.intel.com, mingo@kernel.org, davem@davemloft.net,
          alexios.zavras@intel.com, adrian.hunter@intel.com,
          alexander.shishkin@linux.intel.com, namhyung@kernel.org,
          dave@stgolabs.net, leo.yan@linaro.org, suzuki.poulose@arm.com,
          tmricht@linux.ibm.com
In-Reply-To: <20190702103420.27540-3-leo.yan@linaro.org>
References: <20190702103420.27540-3-leo.yan@linaro.org>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/urgent] perf stat: Fix use-after-freed pointer detected
 by the smatch tool
Git-Commit-ID: c74b05030edb3b52f4208d8415b8c933bc509a29
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> 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
Precedence: bulk

Commit-ID:  c74b05030edb3b52f4208d8415b8c933bc509a29
Gitweb:     https://git.kernel.org/tip/c74b05030edb3b52f4208d8415b8c933bc509a29
Author:     Leo Yan <leo.yan@linaro.org>
AuthorDate: Tue, 2 Jul 2019 18:34:11 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 9 Jul 2019 09:33:54 -0300

perf stat: Fix use-after-freed pointer detected by the smatch tool

Based on the following report from Smatch, fix the use-after-freed
pointer.

  tools/perf/builtin-stat.c:1353
  add_default_attributes() warn: passing freed memory 'str'.

The pointer 'str' has been freed but later it is still passed into the
function parse_events_print_error().  This patch fixes this
use-after-freed issue.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Alexios Zavras <alexios.zavras@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Saint-Etienne <eric.saint.etienne@oracle.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Song Liu <songliubraving@fb.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: http://lkml.kernel.org/r/20190702103420.27540-3-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-stat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index e5e19b461061..b81f7b197d24 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1349,8 +1349,8 @@ static int add_default_attributes(void)
 				fprintf(stderr,
 					"Cannot set up top down events %s: %d\n",
 					str, err);
-				free(str);
 				parse_events_print_error(&errinfo, str);
+				free(str);
 				return -1;
 			}
 		} else {