From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96C89C32750 for ; Fri, 2 Aug 2019 13:25:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6064F21855 for ; Fri, 2 Aug 2019 13:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752315; bh=Sgpqeh+NR9SOS+1Y8CwMpjt4Y3oxd/Vxt/b/m5hjxI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KrdM2RZh70y4YdgpAq0JO2F+crez4sUtRJst9IKvBtIsZ2WS5HrasuaMkrrx/8JXv Niure0d0a98FbWTl+TSoZQS/EfyewJVtVtyBGZST2S1QctSLwBcMjs8nqtT3IL7tU9 en9V7/lkHD0jD3/AYNetqhEJ935C19hF44fe4LZY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394345AbfHBNZO (ORCPT ); Fri, 2 Aug 2019 09:25:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:35896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394324AbfHBNZJ (ORCPT ); Fri, 2 Aug 2019 09:25:09 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ED6AD2183F; Fri, 2 Aug 2019 13:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752308; bh=Sgpqeh+NR9SOS+1Y8CwMpjt4Y3oxd/Vxt/b/m5hjxI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYfXNIZTsZFZWf3ZNHFg7+1yQzn1pLJIJbg/Z5OFbswttdR3EdOdvfxUaicnVqSEs yKUedpNMKhxnMuj4VVIybAgCWqLDgJ7B90uAi1+ptUCzyccmtwwz0fj8mBiCQErdwb NZuzhe6OQ9ZqyVOk8z2fBNZ1MBLgFGA6UVcVKUDs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Adrian Hunter , Jiri Olsa , Masami Hiramatsu , Namhyung Kim , Sasha Levin Subject: [PATCH AUTOSEL 4.14 20/30] perf probe: Avoid calling freeing routine multiple times for same pointer Date: Fri, 2 Aug 2019 09:24:12 -0400 Message-Id: <20190802132422.13963-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132422.13963-1-sashal@kernel.org> References: <20190802132422.13963-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo [ Upstream commit d95daf5accf4a72005daa13fbb1d1bd8709f2861 ] When perf_add_probe_events() we call cleanup_perf_probe_events() for the pev pointer it receives, then, as part of handling this failure the main 'perf probe' goes on and calls cleanup_params() and that will again call cleanup_perf_probe_events()for the same pointer, so just set nevents to zero when handling the failure of perf_add_probe_events() to avoid the double free. Cc: Adrian Hunter Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-x8qgma4g813z96dvtw9w219q@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-probe.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index c0065923a525f..e1ac51aaedcff 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c @@ -712,6 +712,16 @@ __cmd_probe(int argc, const char **argv) ret = perf_add_probe_events(params.events, params.nevents); if (ret < 0) { + + /* + * When perf_add_probe_events() fails it calls + * cleanup_perf_probe_events(pevs, npevs), i.e. + * cleanup_perf_probe_events(params.events, params.nevents), which + * will call clear_perf_probe_event(), so set nevents to zero + * to avoid cleanup_params() to call clear_perf_probe_event() again + * on the same pevs. + */ + params.nevents = 0; pr_err_with_code(" Error: Failed to add events.", ret); return ret; } -- 2.20.1