b4281b2f75
[ Upstream commit 2eb5dd418034ecea2f7031e3d33f2991a878b148 ]
When using 'perf record's option '-I' or '--user-regs=' along with
argument '?' to list available register names, memory of variable 'os'
allocated by strdup() needs to be released before __parse_regs()
returns, otherwise memory leak will occur.
Fixes: bcc84ec65ad1 ("perf record: Add ability to name registers to record")
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Li Bin <huawei.libin@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20200703093344.189450-1-zhengzengkai@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
73 lines
1.3 KiB
C
73 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "perf.h"
|
|
#include "util/util.h"
|
|
#include "util/debug.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "util/parse-regs-options.h"
|
|
|
|
int
|
|
parse_regs(const struct option *opt, const char *str, int unset)
|
|
{
|
|
uint64_t *mode = (uint64_t *)opt->value;
|
|
const struct sample_reg *r;
|
|
char *s, *os = NULL, *p;
|
|
int ret = -1;
|
|
|
|
if (unset)
|
|
return 0;
|
|
|
|
/*
|
|
* cannot set it twice
|
|
*/
|
|
if (*mode)
|
|
return -1;
|
|
|
|
/* str may be NULL in case no arg is passed to -I */
|
|
if (str) {
|
|
/* because str is read-only */
|
|
s = os = strdup(str);
|
|
if (!s)
|
|
return -1;
|
|
|
|
for (;;) {
|
|
p = strchr(s, ',');
|
|
if (p)
|
|
*p = '\0';
|
|
|
|
if (!strcmp(s, "?")) {
|
|
fprintf(stderr, "available registers: ");
|
|
for (r = sample_reg_masks; r->name; r++) {
|
|
fprintf(stderr, "%s ", r->name);
|
|
}
|
|
fputc('\n', stderr);
|
|
/* just printing available regs */
|
|
goto error;
|
|
}
|
|
for (r = sample_reg_masks; r->name; r++) {
|
|
if (!strcasecmp(s, r->name))
|
|
break;
|
|
}
|
|
if (!r->name) {
|
|
ui__warning("unknown register %s,"
|
|
" check man page\n", s);
|
|
goto error;
|
|
}
|
|
|
|
*mode |= r->mask;
|
|
|
|
if (!p)
|
|
break;
|
|
|
|
s = p + 1;
|
|
}
|
|
}
|
|
ret = 0;
|
|
|
|
/* default to all possible regs */
|
|
if (*mode == 0)
|
|
*mode = PERF_REGS_MASK;
|
|
error:
|
|
free(os);
|
|
return ret;
|
|
}
|