From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753429AbdJGWiG (ORCPT ); Sat, 7 Oct 2017 18:38:06 -0400 Received: from omzsmtpe02.verizonbusiness.com ([199.249.25.209]:62064 "EHLO omzsmtpe02.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753378AbdJGWiA (ORCPT ); Sat, 7 Oct 2017 18:38:00 -0400 From: "Levin, Alexander (Sasha Levin)" Cc: Taeung Song , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Wang Nan , Arnaldo Carvalho de Melo , "Levin, Alexander (Sasha Levin)" X-Host: mariner.tdc.vzwcorp.com To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH review for 4.4 11/24] perf tools: Only increase index if perf_evsel__new_idx() succeeds Thread-Topic: [PATCH review for 4.4 11/24] perf tools: Only increase index if perf_evsel__new_idx() succeeds Thread-Index: AQHTP7zlXnBK24rHP0+OU+3OOwfqiQ== Date: Sat, 7 Oct 2017 22:37:46 +0000 Message-ID: <20171007223738.25013-11-alexander.levin@verizon.com> References: <20171007223738.25013-1-alexander.levin@verizon.com> In-Reply-To: <20171007223738.25013-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id v97MqFdn029937 From: Taeung Song [ Upstream commit 75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42 ] Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1485952447-7013-2-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/parse-events.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 38304b7e4f81..e81dfb2e239c 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -291,10 +291,11 @@ __add_event(struct list_head *list, int *idx, event_attr_init(attr); - evsel = perf_evsel__new_idx(attr, (*idx)++); + evsel = perf_evsel__new_idx(attr, *idx); if (!evsel) return NULL; + (*idx)++; evsel->cpus = cpu_map__get(cpus); evsel->own_cpus = cpu_map__get(cpus); -- 2.11.0