Skip to content

Commit 29b1d46

Browse files
committed
Merge tag 'trace-rtla-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull real time analysis tool (rtla) updates from Steven Rostedt: - Fix a double free - Define syscall numbers for RISCV - Fix Makefile when called from -C tools - Use calloc() to check for memory allocation failures * tag 'trace-rtla-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: rtla: Define syscall numbers for riscv rtla: Fix double free rtla: Fix Makefile when called from -C tools/ rtla/utils: Use calloc and check the potential memory allocation failure
2 parents b2a88c2 + dd0b15b commit 29b1d46

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

tools/tracing/rtla/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NAME := rtla
22
# Follow the kernel version
3-
VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
3+
VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
44

55
# From libtracefs:
66
# Makefiles suck: This macro sets a default value of $(2) for the

tools/tracing/rtla/src/trace.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,18 @@ void trace_instance_destroy(struct trace_instance *trace)
134134
if (trace->inst) {
135135
disable_tracer(trace->inst);
136136
destroy_instance(trace->inst);
137+
trace->inst = NULL;
137138
}
138139

139-
if (trace->seq)
140+
if (trace->seq) {
140141
free(trace->seq);
142+
trace->seq = NULL;
143+
}
141144

142-
if (trace->tep)
145+
if (trace->tep) {
143146
tep_free(trace->tep);
147+
trace->tep = NULL;
148+
}
144149
}
145150

146151
/*

tools/tracing/rtla/src/utils.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ int parse_cpu_list(char *cpu_list, char **monitored_cpus)
106106

107107
nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
108108

109-
mon_cpus = malloc(nr_cpus * sizeof(char));
110-
memset(mon_cpus, 0, (nr_cpus * sizeof(char)));
109+
mon_cpus = calloc(nr_cpus, sizeof(char));
110+
if (!mon_cpus)
111+
goto err;
111112

112113
for (p = cpu_list; *p; ) {
113114
cpu = atoi(p);
@@ -224,7 +225,7 @@ long parse_ns_duration(char *val)
224225
#elif __arm__
225226
# define __NR_sched_setattr 380
226227
# define __NR_sched_getattr 381
227-
#elif __aarch64__
228+
#elif __aarch64__ || __riscv
228229
# define __NR_sched_setattr 274
229230
# define __NR_sched_getattr 275
230231
#elif __powerpc__

0 commit comments

Comments
 (0)