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=-18.8 required=3.0 tests=BAYES_00,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=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 8469AC433DB for ; Fri, 25 Dec 2020 05:29:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 529FA23130 for ; Fri, 25 Dec 2020 05:29:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726126AbgLYF2s (ORCPT ); Fri, 25 Dec 2020 00:28:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725853AbgLYF2r (ORCPT ); Fri, 25 Dec 2020 00:28:47 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EDD5C061757 for ; Thu, 24 Dec 2020 21:28:07 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id x126so2144090pfc.7 for ; Thu, 24 Dec 2020 21:28:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fggFNHkIm4LYrEAhkgghWWYvuA1sVNNnoLCFYuyGlq0=; b=kEN7zSRi+7riSkXhcZrU8TJWQ4DnunTjyGXKsR69nYEFYNq64ohC72qdjFnHuXBBhC y9REVFiXQvPsL4WT62tXjdG5TZbFfQ5JFtRrN078rt8NzJ/v/z73Z70RYBj60V5fM6IR 2Ipq89qwjypEeyT92GO2qgvF0tobYN3uu4bGeyQHOWXpT4kN3mg0AA2/Edmt//bL8JaM jJ4P7b5tmFsz2GCc/ImFJyv+ts+nQm7jPrAyk/TQ11nLu4TyaFMycOL1Nrnu3Yw/YErp 0B7b6IRQRtKIWwN9Ql17vWPXVnEjn2HFGEnStKxReFEmDIHCXFMnfFJ0AQiLRNm11VbM fODg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fggFNHkIm4LYrEAhkgghWWYvuA1sVNNnoLCFYuyGlq0=; b=er2E3im97ChRdats9ggRpg+tZ6vJB9FHHsACW7i7CA/wVZeVZYi7Z3CfM5LpzesB27 h1/nnsKyDLRk/dvPWxqCioSkXXfucuiMoAaxky9YHEBPjOKd9D1p0y9z4kXE4M76lOSc IwkxJ62DjP4dq5lhoP4NrldLrGLOLD2/0Bdn+4mRIPAt8W9UGTGkTUe7E8QO4wz7xdag dhMHHPw/5cAO7tnUODhWjn/ygo30fzBVTtNz6LbvKWkJ6+GARwNrALz17TGIF8U8deRm JL6B/NO/nrDzTzHQbViBDFA6AJZ6kWi61E/4vJU+gP6bpdNKTYTLWWu1ZFNdaatu3gDc dhWw== X-Gm-Message-State: AOAM530OFTgzGnWWMgHrm1l2mtgvYBectDqfkLNa1XsYOIrP1XuNRXCC yLdUBeBeMGkaKmJpXMtyZjTFLA== X-Google-Smtp-Source: ABdhPJxH3HZ5HXhbr/CHl5MUe98jSpKJsDIbtdnv3P2YMkrXMNZCm+tx78RxEj+4EoNtjQ8SOVcwyA== X-Received: by 2002:aa7:9ab7:0:b029:19d:ac89:39aa with SMTP id x23-20020aa79ab70000b029019dac8939aamr30486597pfi.10.1608874086935; Thu, 24 Dec 2020 21:28:06 -0800 (PST) Received: from localhost ([45.137.216.7]) by smtp.gmail.com with ESMTPSA id g85sm28526152pfb.4.2020.12.24.21.28.06 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Dec 2020 21:28:06 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , John Garry , Will Deacon , Mathieu Poirier , Masami Hiramatsu , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Alexandre Truong , Ian Rogers , Thomas Richter , He Zhe , Sumanth Korikkar , Alexis Berlemont , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Leo Yan , stable@vger.kernel.org Subject: [PATCH v2 1/3] perf probe: Fix memory leak in synthesize_sdt_probe_command() Date: Fri, 25 Dec 2020 13:27:49 +0800 Message-Id: <20201225052751.24513-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201225052751.24513-1-leo.yan@linaro.org> References: <20201225052751.24513-1-leo.yan@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo In synthesize_sdt_probe_command(), it gets argument array from argv_split() but forgets to free it. This patch calls argv_free() to free the argument array to avoid memory leak. Fixes: 3b1f8311f696 ("perf probe: Add sdt probes arguments into the uprobe cmd string") Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Leo Yan Cc: stable@vger.kernel.org --- tools/perf/util/probe-file.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 064b63a6a3f3..bbecb449ea94 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -791,7 +791,7 @@ static char *synthesize_sdt_probe_command(struct sdt_note *note, const char *sdtgrp) { struct strbuf buf; - char *ret = NULL, **args; + char *ret = NULL; int i, args_count, err; unsigned long long ref_ctr_offset; @@ -813,12 +813,19 @@ static char *synthesize_sdt_probe_command(struct sdt_note *note, goto out; if (note->args) { - args = argv_split(note->args, &args_count); + char **args = argv_split(note->args, &args_count); + + if (args == NULL) + goto error; for (i = 0; i < args_count; ++i) { - if (synthesize_sdt_probe_arg(&buf, i, args[i]) < 0) + if (synthesize_sdt_probe_arg(&buf, i, args[i]) < 0) { + argv_free(args); goto error; + } } + + argv_free(args); } out: -- 2.17.1