From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Weigang He <geoffreyhe2@gmail.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
Tuo Li <islituo@gmail.com>
Subject: Re: [PATCH] scripts/tracepoint-update: fix memory leak in make_trace_array()
Date: Wed, 21 Jan 2026 11:30:35 +0900 [thread overview]
Message-ID: <20260121113035.20f1f464c5f416998d577784@kernel.org> (raw)
In-Reply-To: <20260118105457.755291a5@robin>
On Sun, 18 Jan 2026 10:54:57 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Sun, 18 Jan 2026 13:02:47 +0000
> Weigang He <geoffreyhe2@gmail.com> wrote:
>
> > In make_trace_array(), if add_string() fails after some successful
> > iterations, the function returns without freeing the 'vals' array that
> > was allocated by previous add_string() calls.
> >
> > The add_string() function uses realloc() internally with a local
> > temporary variable, which means the original pointer is preserved on
> > allocation failure. When make_trace_array() returns early on error,
> > the previously allocated memory is leaked.
> >
> > Fix this by freeing 'vals' before returning on the error path.
> >
> > This bug is found by my static analysis tool and my code review.
> >
> > Signed-off-by: Tuo Li <islituo@gmail.com>
> > ---
> > scripts/tracepoint-update.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/scripts/tracepoint-update.c b/scripts/tracepoint-update.c
> > index 90046aedc97b9..7bc9d66229ddf 100644
> > --- a/scripts/tracepoint-update.c
> > +++ b/scripts/tracepoint-update.c
> > @@ -93,8 +93,10 @@ static void make_trace_array(struct elf_tracepoint *etrace)
> > for_each_shdr_str(len, ehdr, check_data_sec) {
> > if (!len)
> > continue;
> > - if (add_string(str, &vals, &count) < 0)
> > + if (add_string(str, &vals, &count) < 0) {
> > + free(vals);
> > return;
> > + }
> > }
>
> It would make much more sense to have add_string() free vals, and set
> vals to NULL on error.
I think it should be failed if it fails to add string. Can it
continue checking tracepoints even after the error?
Thank you,
>
> -- Steve
>
>
> >
> > /* If CONFIG_TRACEPOINT_VERIFY_USED is not set, there's nothing to do */
>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2026-01-21 2:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-18 13:02 [PATCH] scripts/tracepoint-update: fix memory leak in make_trace_array() Weigang He
2026-01-18 15:54 ` Steven Rostedt
2026-01-21 2:30 ` Masami Hiramatsu [this message]
2026-01-21 14:41 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260121113035.20f1f464c5f416998d577784@kernel.org \
--to=mhiramat@kernel.org \
--cc=geoffreyhe2@gmail.com \
--cc=islituo@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox