malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libsubcmd: Fix memory leak in uniq()

Browse Source 
[ 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 <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chenyuan Mi <cymi20@fudan.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231208000515.1693746-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 0d143f52174d588228fa73275de701d58b62ea4a)
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
This commit is contained in:
Ian Rogers 2023-12-07 16:05:13 -08:00 committed by Vegard Nossum
parent 2b84420be1
commit 56552e5cf5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/lib/subcmd/help.c
View File

@ -50,11 +50,21 @@ void uniq(struct cmdnames *cmds)
if (!cmds->cnt) if (!cmds->cnt)
return; return;
for (i = j = 1; i < cmds->cnt; i++) for (i = 1; i < cmds->cnt; i++) {
if (strcmp(cmds->names[i]->name, cmds->names[i-1]->name)) if (!strcmp(cmds->names[i]->name, cmds->names[i-1]->name))
cmds->names[j++] = cmds->names[i]; 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; cmds->cnt = j;
while (j < i)
cmds->names[j++] = NULL;
} }
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes) void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)