* [PATCH v2] tracing/synthetic: Free type string on error path
@ 2026-07-07 13:24 Yu Peng
2026-07-07 17:54 ` Steven Rostedt
0 siblings, 1 reply; 2+ messages in thread
From: Yu Peng @ 2026-07-07 13:24 UTC (permalink / raw)
To: rostedt
Cc: mhiramat, mathieu.desnoyers, linux-trace-kernel, linux-kernel,
Yu Peng
parse_synth_field() builds a "__data_loc ..." type string before
assigning it to field->type. If the seq_buf check fails, the temporary
string is not owned by field and is leaked. Free it before leaving.
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Yu Peng <pengyu@kylinos.cn>
---
Changes in v2:
- Use __free(kfree) and no_free_ptr() as suggested by Steven.
kernel/trace/trace_events_synth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
index e6871230bde96..ad2e70258291b 100644
--- a/kernel/trace/trace_events_synth.c
+++ b/kernel/trace/trace_events_synth.c
@@ -828,7 +828,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
} else if (size == 0) {
if (synth_field_is_string(field->type) ||
synth_field_is_stack(field->type)) {
- char *type;
+ char *type __free(kfree) = NULL;
len = sizeof("__data_loc ") + strlen(field->type) + 1;
type = kzalloc(len, GFP_KERNEL);
@@ -844,7 +844,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
s.buffer[s.len] = '\0';
kfree(field->type);
- field->type = type;
+ field->type = no_free_ptr(type);
field->is_dynamic = true;
size = sizeof(u64);
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] tracing/synthetic: Free type string on error path
2026-07-07 13:24 [PATCH v2] tracing/synthetic: Free type string on error path Yu Peng
@ 2026-07-07 17:54 ` Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2026-07-07 17:54 UTC (permalink / raw)
To: Yu Peng; +Cc: mhiramat, mathieu.desnoyers, linux-trace-kernel, linux-kernel
On Tue, 7 Jul 2026 21:24:17 +0800
Yu Peng <pengyu@kylinos.cn> wrote:
> parse_synth_field() builds a "__data_loc ..." type string before
> assigning it to field->type. If the seq_buf check fails, the temporary
> string is not owned by field and is leaked. Free it before leaving.
>
> Suggested-by: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Yu Peng <pengyu@kylinos.cn>
> ---
> Changes in v2:
> - Use __free(kfree) and no_free_ptr() as suggested by Steven.
>
> kernel/trace/trace_events_synth.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
> index e6871230bde96..ad2e70258291b 100644
> --- a/kernel/trace/trace_events_synth.c
> +++ b/kernel/trace/trace_events_synth.c
> @@ -828,7 +828,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
> } else if (size == 0) {
> if (synth_field_is_string(field->type) ||
> synth_field_is_stack(field->type)) {
> - char *type;
> + char *type __free(kfree) = NULL;
Ah, we can't do this here.
(Sashiko pointed this out: https://sashiko.dev/#/patchset/20260707132417.2193412-1-pengyu%40kylinos.cn )
>
> len = sizeof("__data_loc ") + strlen(field->type) + 1;
> type = kzalloc(len, GFP_KERNEL);
Because after this code we have:
type = kzalloc(len, GFP_KERNEL);
if (!type)
goto free;
Which jumps out of the if block, and that will break the cleanup.
I'll take you original version for now.
-- Steve
> @@ -844,7 +844,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
> s.buffer[s.len] = '\0';
>
> kfree(field->type);
> - field->type = type;
> + field->type = no_free_ptr(type);
>
> field->is_dynamic = true;
> size = sizeof(u64);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-07-07 17:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-07 13:24 [PATCH v2] tracing/synthetic: Free type string on error path Yu Peng
2026-07-07 17:54 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox