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 61F2453E07; Sun, 28 Jan 2024 16:12:10 +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=1706458330; cv=none; b=Id/e+t4VVYFyJ0zt33SOSZaOc4G8FRdRKFv+E6CUwMiBXZhtTe46L1ClSP6lue+SNYjsZezSev/a0xUlP6qS8uc5E3zmPg2SJ0Wld3EQUKCEi0NhUBnTLQb5UtK1+8huhTmoEe6VCOhXVmERoIFHbjxvaPjd0/NOT+KipjG5KnE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458330; c=relaxed/simple; bh=UgVPDJioGERvTSvTyY6/qpVX6AWXCKIz4tazoTvzyew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mSfX214ha0IhkRSqqY/UsM5uNRnycEEqZ4eeX26L+hcArSas++RG9V8ItS9p0vTjeW58aUVuGKY38BlOil5sNfOch7fs+9uI1c830dru51m65gqEoQfuGKDOlpLjAp84cHT3S2Zzjqaew49nUWDDZtmBxqWuWXPtj3tobakLYtU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eQAPOP7C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eQAPOP7C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D79C9C43390; Sun, 28 Jan 2024 16:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706458330; bh=UgVPDJioGERvTSvTyY6/qpVX6AWXCKIz4tazoTvzyew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eQAPOP7CJ31rxKBg5onXyaY5YOkWkjephBDpVc0jxMawSDZhKea38WKixP0w7UXia UCZn5Brw843iSWMMzBm3eSs92lL+LYz5TMqq8BjaRSw4qg7NelfzF0FGAE5CodOHqf dXxRWGUZpQYsMJFlyAFswOcGqsw4pObaV+bI0UKEet3cDVgomPqJBA6He1ohspZREY G5wR3NSW4aE8V3iWz8t1xiajy6QaNH/6QjFNE9ddqatbJJhk/Pzq1cNAcH/kcb23T2 Ykm62MPNeeLbhnglXK0E24rO6UdgpZ5EH34Qzzt0UiLs9iKQshv9Um3PKY0iBe4wAR Mm45SqNPCrBFA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , Adrian Hunter , Alexander Shishkin , Chenyuan Mi , Ingo Molnar , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 6.7 22/39] libsubcmd: Fix memory leak in uniq() Date: Sun, 28 Jan 2024 11:10:42 -0500 Message-ID: <20240128161130.200783-22-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240128161130.200783-1-sashal@kernel.org> References: <20240128161130.200783-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7.2 Content-Transfer-Encoding: 8bit From: Ian Rogers [ Upstream commit ad30469a841b50dbb541df4d6971d891f703c297 ] uniq() will write one command name over another causing the overwritten string to be leaked. Fix by doing a pass that removes duplicates and a second that removes the holes. Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Chenyuan Mi Cc: Ingo Molnar Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20231208000515.1693746-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/lib/subcmd/help.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/lib/subcmd/help.c b/tools/lib/subcmd/help.c index adfbae27dc36..8561b0f01a24 100644 --- a/tools/lib/subcmd/help.c +++ b/tools/lib/subcmd/help.c @@ -52,11 +52,21 @@ void uniq(struct cmdnames *cmds) if (!cmds->cnt) return; - for (i = j = 1; i < cmds->cnt; i++) - if (strcmp(cmds->names[i]->name, cmds->names[i-1]->name)) - cmds->names[j++] = cmds->names[i]; - + for (i = 1; i < cmds->cnt; i++) { + if (!strcmp(cmds->names[i]->name, cmds->names[i-1]->name)) + zfree(&cmds->names[i - 1]); + } + for (i = 0, j = 0; i < cmds->cnt; i++) { + if (cmds->names[i]) { + if (i == j) + j++; + else + cmds->names[j++] = cmds->names[i]; + } + } cmds->cnt = j; + while (j < i) + cmds->names[j++] = NULL; } void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes) -- 2.43.0