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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 28DE3C432C0 for ; Fri, 22 Nov 2019 14:58:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0CA62071C for ; Fri, 22 Nov 2019 14:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574434710; bh=ek8BA65IDtI5nq1rFXATIe7Ij5GaPGbZPFSb8Sut9Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LsBmTE6eaT1fzA7o0p40OdTBIIxXeZHnpoP3+YxMVAelgX9fTFNBZi8HSk3aisDaJ r629ieHupjw188u8vgHfmII4OLhwURcOU39LWVg1huRg4Gr7SSieWaCde22Sg9XjWm 4csiwxNYUQuNqHGyd4BEzfvn8LPH8ofJeNUqZatk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727745AbfKVO62 (ORCPT ); Fri, 22 Nov 2019 09:58:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:59422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727698AbfKVO6Z (ORCPT ); Fri, 22 Nov 2019 09:58:25 -0500 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 928172073F; Fri, 22 Nov 2019 14:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574434704; bh=ek8BA65IDtI5nq1rFXATIe7Ij5GaPGbZPFSb8Sut9Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EH+qAJTHwtcXfaHVTD+GE2hIrsLDPaBul4WvIxa1LmHexuavU/NZtVKQABr//nhbg 1Ymy+gSddR009jWaH2uk92D/2QMDiuQSDNWjvNHpKsUUDVR83rrP882lEOXoFji2mW HyiBuyfZmMXl5sXd438JLco0Mxx32CtwcK2WBke4= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Hewenliang , Steven Rostedt , Tzvetomir Stoyanov , Arnaldo Carvalho de Melo Subject: [PATCH 24/26] libtraceevent: Fix memory leakage in copy_filter_type Date: Fri, 22 Nov 2019 11:57:09 -0300 Message-Id: <20191122145711.3171-25-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191122145711.3171-1-acme@kernel.org> References: <20191122145711.3171-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hewenliang It is necessary to free the memory that we have allocated when error occurs. Fixes: ef3072cd1d5c ("tools lib traceevent: Get rid of die in add_filter_type()") Signed-off-by: Hewenliang Reviewed-by: Steven Rostedt (VMware) Cc: Tzvetomir Stoyanov Link: http://lore.kernel.org/lkml/20191119014415.57210-1-hewenliang4@huawei.com Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/parse-filter.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index 552592d153fb..f3cbf86e51ac 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -1473,8 +1473,10 @@ static int copy_filter_type(struct tep_event_filter *filter, if (strcmp(str, "TRUE") == 0 || strcmp(str, "FALSE") == 0) { /* Add trivial event */ arg = allocate_arg(); - if (arg == NULL) + if (arg == NULL) { + free(str); return -1; + } arg->type = TEP_FILTER_ARG_BOOLEAN; if (strcmp(str, "TRUE") == 0) @@ -1483,8 +1485,11 @@ static int copy_filter_type(struct tep_event_filter *filter, arg->boolean.value = 0; filter_type = add_filter_type(filter, event->id); - if (filter_type == NULL) + if (filter_type == NULL) { + free(str); + free_arg(arg); return -1; + } filter_type->filter = arg; -- 2.21.0