From: Zheng Yejian <zhengyejian1@huawei.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: <mhiramat@kernel.org>, <mark.rutland@arm.com>,
<mathieu.desnoyers@efficios.com>, <Markus.Elfring@web.de>,
<linux-kernel@vger.kernel.org>,
<linux-trace-kernel@vger.kernel.org>
Subject: Re: [PATCH v3] ftrace: Fix possible use-after-free issue in ftrace_location()
Date: Thu, 9 May 2024 09:39:06 +0800 [thread overview]
Message-ID: <b5aeabea-b077-2b16-4bcc-dd4dd8d8e6e9@huawei.com> (raw)
In-Reply-To: <20240502170743.15a5ff1c@gandalf.local.home>
On 2024/5/3 05:07, Steven Rostedt wrote:
> On Wed, 17 Apr 2024 11:28:30 +0800
> Zheng Yejian <zhengyejian1@huawei.com> wrote:
>
>> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
>> index da1710499698..e05d3e3dc06a 100644
>> --- a/kernel/trace/ftrace.c
>> +++ b/kernel/trace/ftrace.c
>> @@ -1581,7 +1581,7 @@ static struct dyn_ftrace *lookup_rec(unsigned long start, unsigned long end)
>> }
>>
>> /**
>> - * ftrace_location_range - return the first address of a traced location
>> + * ftrace_location_range_rcu - return the first address of a traced location
>
> kerneldoc comments are for external functions. You need to move this down
> to ftrace_location_range() as here you are commenting a local static function.
I'll do it in v4.
>
> But I have to ask, why did you create this static function anyway? There's
> only one user of it (the ftrace_location_range()). Why didn't you just
> simply add the rcu locking there?
Yes, the only-one-user function looks ugly.
At first thought that ftrace_location_range() needs to a lock, I just do like that,
no specital reason.
>
> unsigned long ftrace_location_range(unsigned long start, unsigned long end)
> {
> struct dyn_ftrace *rec;
> unsigned long ip = 0;
>
> rcu_read_lock();
> rec = lookup_rec(start, end);
> if (rec)
> ip = rec->ip;
> rcu_read_unlock();
>
> return ip;
> }
>
> -- Steve
>
>
>> * if it touches the given ip range
>> * @start: start of range to search.
>> * @end: end of range to search (inclusive). @end points to the last byte
>> @@ -1592,7 +1592,7 @@ static struct dyn_ftrace *lookup_rec(unsigned long start, unsigned long end)
>> * that is either a NOP or call to the function tracer. It checks the ftrace
>> * internal tables to determine if the address belongs or not.
>> */
>> -unsigned long ftrace_location_range(unsigned long start, unsigned long end)
>> +static unsigned long ftrace_location_range_rcu(unsigned long start, unsigned long end)
>> {
>> struct dyn_ftrace *rec;
>>
>> @@ -1603,6 +1603,16 @@ unsigned long ftrace_location_range(unsigned long start, unsigned long end)
>> return 0;
>> }
>>
>> +unsigned long ftrace_location_range(unsigned long start, unsigned long end)
>> +{
>> + unsigned long loc;
>> +
>> + rcu_read_lock();
>> + loc = ftrace_location_range_rcu(start, end);
>> + rcu_read_unlock();
>> + return loc;
>> +}
>
next prev parent reply other threads:[~2024-05-09 1:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-01 12:55 [PATCH] ftrace: Fix use-after-free issue in ftrace_location() Zheng Yejian
2024-04-10 15:28 ` Steven Rostedt
2024-04-11 1:48 ` Zheng Yejian
2024-04-16 11:24 ` [PATCH v2] ftrace: Fix possible " Zheng Yejian
2024-04-16 15:57 ` Markus Elfring
2024-04-17 3:28 ` [PATCH v3] " Zheng Yejian
2024-05-02 21:07 ` Steven Rostedt
2024-05-09 1:39 ` Zheng Yejian [this message]
2024-05-09 19:28 ` [PATCH v4] " Zheng Yejian
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=b5aeabea-b077-2b16-4bcc-dd4dd8d8e6e9@huawei.com \
--to=zhengyejian1@huawei.com \
--cc=Markus.Elfring@web.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--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