From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Stanislav Fomichev <stfomichev@yandex-team.ru>,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@redhat.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 2/8] perf session: Free cpu_map in perf_session__cpu_bitmap
Date: Tue, 21 Jan 2014 17:42:58 -0300 [thread overview]
Message-ID: <1390336984-1553-3-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1390336984-1553-1-git-send-email-acme@infradead.org>
From: Stanislav Fomichev <stfomichev@yandex-team.ru>
This method uses a temporary struct cpu_map to figure out the cpus
present in the received cpu list in string form, but it failed to free
it after returning. Fix it.
Signed-off-by: Stanislav Fomichev <stfomichev@yandex-team.ru>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1390217980-22424-3-git-send-email-stfomichev@yandex-team.ru
[ Use goto + err = -1 to do the delete just once, in the normal exit path ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/session.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 7acc03e8f3b2..0b39a48e5110 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1573,7 +1573,7 @@ next:
int perf_session__cpu_bitmap(struct perf_session *session,
const char *cpu_list, unsigned long *cpu_bitmap)
{
- int i;
+ int i, err = -1;
struct cpu_map *map;
for (i = 0; i < PERF_TYPE_MAX; ++i) {
@@ -1602,13 +1602,17 @@ int perf_session__cpu_bitmap(struct perf_session *session,
if (cpu >= MAX_NR_CPUS) {
pr_err("Requested CPU %d too large. "
"Consider raising MAX_NR_CPUS\n", cpu);
- return -1;
+ goto out_delete_map;
}
set_bit(cpu, cpu_bitmap);
}
- return 0;
+ err = 0;
+
+out_delete_map:
+ cpu_map__delete(map);
+ return err;
}
void perf_session__fprintf_info(struct perf_session *session, FILE *fp,
--
1.8.1.4
next prev parent reply other threads:[~2014-01-21 20:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-21 20:42 [GIT PULL 0/8] perf/core fixes Arnaldo Carvalho de Melo
2014-01-21 20:42 ` [PATCH 1/8] perf timechart: Fix wrong SVG height Arnaldo Carvalho de Melo
2014-01-21 20:42 ` Arnaldo Carvalho de Melo [this message]
2014-01-21 20:42 ` [PATCH 3/8] perf tools: Add support for the xtensa architecture Arnaldo Carvalho de Melo
2014-01-21 20:43 ` [PATCH 4/8] perf stat: fix NULL pointer reference bug with event unit Arnaldo Carvalho de Melo
2014-01-21 20:43 ` [PATCH 5/8] perf tools: Ensure sscanf does not overrun the "mem" field Arnaldo Carvalho de Melo
2014-01-21 20:43 ` [PATCH 6/8] perf evsel: Remove duplicate member zeroing after free Arnaldo Carvalho de Melo
2014-01-21 20:43 ` [PATCH 7/8] perf stat: Fix memory corruption of xyarray when cpumask is used Arnaldo Carvalho de Melo
2014-01-21 20:43 ` [PATCH 8/8] perf symbols: Fix JIT symbol resolution on heap Arnaldo Carvalho de Melo
2014-01-23 16:45 ` [GIT PULL 0/8] perf/core fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390336984-1553-3-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=stfomichev@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®