Message ID | 20210726153829.708142663@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <stable-owner@kernel.org> 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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 A57ECC4320E for <stable@archiver.kernel.org>; Mon, 26 Jul 2021 15:47:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E5C960F38 for <stable@archiver.kernel.org>; Mon, 26 Jul 2021 15:47:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236191AbhGZPH2 (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 26 Jul 2021 11:07:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:46876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235994AbhGZPGv (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 26 Jul 2021 11:06:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3626860525; Mon, 26 Jul 2021 15:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627314439; bh=szVZlU4YsjHnrJ0qtiJTnV4aFZY/qkCUx/qLoMHpJCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wv2r9NljOBYhc1+kdAHpf6XrJ71g0Aq513bYVeOX2HFNiooXEDT0YhyTB4+0UbMPh fiT0hHAxcogBbCFYRQCkZupAn1v+fpnmcDEhvTFv3EwFT7cCgpFXJP1a9zKPazPELZ BjdAsl+lx1JsOT5NNRLSua4eX6YXT9IojBA/SVl8= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Riccardo Mancini <rickyman7@gmail.com>, Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Namhyung Kim <namhyung@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Arnaldo Carvalho de Melo <acme@redhat.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.14 47/82] perf probe-file: Delete namelist in del_events() on the error path Date: Mon, 26 Jul 2021 17:38:47 +0200 Message-Id: <20210726153829.708142663@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153828.144714469@linuxfoundation.org> References: <20210726153828.144714469@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 6ab9230ce8ee..4de93df73c4c 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -342,11 +342,11 @@ int probe_file__del_events(int fd, struct strfilter *filter) ret = probe_file__get_events(fd, filter, namelist); if (ret < 0) - return ret; + goto out; ret = probe_file__del_strlist(fd, namelist); +out: strlist__delete(namelist); - return ret; }