From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB4D41974FE; Thu, 6 Jun 2024 14:09:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682951; cv=none; b=CDAlpeZkeD3BW0rNyDLpL1d7g4T7j6WzzZIk16EVn51BXpQAJ1jOlGXUaQuCHl7Ssy1ENYIL5XiyRey0lLqdgZ21jv2Xlsa1lrhHtfdY0+MbS2Z+o8P9RR6ecALPlGJ5U4kZDLoWODcVB1B6QcjTpogKD+d0QAP+BlGP/yWxxqM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682951; c=relaxed/simple; bh=sbZL2tFMaXilo7/2mjASPKfh9IeFVJFOQxKaKFsdQeo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TSIiv9u1aVLR5sXnx5/vEeqhJXJkFu5Neh830Ep9ybVa5yvNMw7CHTrjZKJfO5N+EQc6p8ehCfSd+vhl5/bMJsPi7AG2tXtL7tYNO+/oawgTOU6FPIEfeS8Xj5xqFxmJTqjDka3fd3gUtW+otQWrsHo+RvB/WPIx9Q6H16l1Bys= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hoqRtlu9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hoqRtlu9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D511C32781; Thu, 6 Jun 2024 14:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682951; bh=sbZL2tFMaXilo7/2mjASPKfh9IeFVJFOQxKaKFsdQeo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hoqRtlu9kZ+eT/ITYeie01bFVgdrKSoinz6XKoNq6S1JpKQ6VZcbQ3YT3kCbBRpGJ cG/f0Y2paf4IXllIosjkl9o1yt+miZOJ2dSAKlfcW+oxlKRNiruWgfWUL3aDZ1oteZ kXSQndHgvpfqrMM7VFbprwNtUKBNgtlKArdTfOF8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Adrian Hunter , Alexander Shishkin , Ingo Molnar , Jiri Olsa , Josh Poimboeuf , Kan Liang , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.9 115/374] libsubcmd: Fix parse-options memory leak Date: Thu, 6 Jun 2024 16:01:34 +0200 Message-ID: <20240606131655.780401113@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 230a7a71f92212e723fa435d4ca5922de33ec88a ] If a usage string is built in parse_options_subcommand, also free it. Fixes: 901421a5bdf605d2 ("perf tools: Remove subcmd dependencies on strbuf") Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20240509052015.1914670-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/lib/subcmd/parse-options.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c index 9fa75943f2ed1..d943d78b787ed 100644 --- a/tools/lib/subcmd/parse-options.c +++ b/tools/lib/subcmd/parse-options.c @@ -633,11 +633,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o const char *const subcommands[], const char *usagestr[], int flags) { struct parse_opt_ctx_t ctx; + char *buf = NULL; /* build usage string if it's not provided */ if (subcommands && !usagestr[0]) { - char *buf = NULL; - astrcatf(&buf, "%s %s [] {", subcmd_config.exec_name, argv[0]); for (int i = 0; subcommands[i]; i++) { @@ -679,7 +678,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt); usage_with_options(usagestr, options); } - + if (buf) { + usagestr[0] = NULL; + free(buf); + } return parse_options_end(&ctx); } -- 2.43.0