From: "Wangshaobo (bobo)" <bobo.shaobowang@huawei.com>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
<naveen.n.rao@linux.ibm.com>, <anil.s.keshavamurthy@intel.com>,
<davem@davemloft.net>, <linux-kernel@vger.kernel.org>,
<huawei.libin@huawei.com>, <cj.chengjian@huawei.com>
Subject: Re: [PATCH] kretprobe: avoid re-registration of the same kretprobe earlier
Date: Tue, 15 Dec 2020 16:39:30 +0800 [thread overview]
Message-ID: <4b1db6c0-2ff3-f163-7d03-ebc594971005@huawei.com> (raw)
In-Reply-To: <20201215123119.35258dd5006942be247600db@kernel.org>
Hi Masami,
I will update and resend it soon
Thank you
-- ShaoBo
在 2020/12/15 11:31, Masami Hiramatsu 写道:
> Hi ShaoBo,
>
> On Wed, 2 Dec 2020 09:23:35 +0800
> "Wangshaobo (bobo)" <bobo.shaobowang@huawei.com> wrote:
>
>> Hi steve, Masami,
>>
>> Thanks for your works, i will check code again and modify properly
>> according to steve's suggestion.
>>
> Can you update your patch and resend it?
>
> Thank you,
>
>> -- ShaoBo
>>
>> 在 2020/12/2 7:32, Masami Hiramatsu 写道:
>>> On Mon, 30 Nov 2020 16:18:50 -0500
>>> Steven Rostedt <rostedt@goodmis.org> wrote:
>>>
>>>> Masami,
>>>>
>>>> Can you review this patch, and also, should this go to -rc and stable?
>>>>
>>>> -- Steve
>>> Thanks for ping me!
>>>
>>>> On Tue, 24 Nov 2020 19:57:19 +0800
>>>> Wang ShaoBo <bobo.shaobowang@huawei.com> wrote:
>>>>
>>>>> Our system encountered a re-init error when re-registering same kretprobe,
>>>>> where the kretprobe_instance in rp->free_instances is illegally accessed
>>>>> after re-init.
>>> Ah, OK. Anyway if re-register happens on kretprobe, it must lose instances
>>> on the list before checking re-register in register_kprobe().
>>> So the idea looks good to me.
>>>
>>>
>>>>> Implementation to avoid re-registration has been introduced for kprobe
>>>>> before, but lags for register_kretprobe(). We must check if kprobe has
>>>>> been re-registered before re-initializing kretprobe, otherwise it will
>>>>> destroy the data struct of kretprobe registered, which can lead to memory
>>>>> leak, system crash, also some unexpected behaviors.
>>>>>
>>>>> we use check_kprobe_rereg() to check if kprobe has been re-registered
>>>>> before calling register_kretprobe(), for giving a warning message and
>>>>> terminate registration process.
>>>>>
>>>>> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
>>>>> Signed-off-by: Cheng Jian <cj.chengjian@huawei.com>
>>>>> ---
>>>>> kernel/kprobes.c | 8 ++++++++
>>>>> 1 file changed, 8 insertions(+)
>>>>>
>>>>> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
>>>>> index 41fdbb7953c6..7f54a70136f3 100644
>>>>> --- a/kernel/kprobes.c
>>>>> +++ b/kernel/kprobes.c
>>>>> @@ -2117,6 +2117,14 @@ int register_kretprobe(struct kretprobe *rp)
>>>>> }
>>>>> }
>>>>>
>>>>> + /*
>>>>> + * Return error if it's being re-registered,
>>>>> + * also give a warning message to the developer.
>>>>> + */
>>>>> + ret = check_kprobe_rereg(&rp->kp);
>>>>> + if (WARN_ON(ret))
>>>>> + return ret;
>>> If you call this here, you must make sure kprobe_addr() is called on rp->kp.
>>> But if kretprobe_blacklist_size == 0, kprobe_addr() is not called before
>>> this check. So it should be in between kprobe_on_func_entry() and
>>> kretprobe_blacklist_size check, like this
>>>
>>> if (!kprobe_on_func_entry(rp->kp.addr, rp->kp.symbol_name, rp->kp.offset))
>>> return -EINVAL;
>>>
>>> addr = kprobe_addr(&rp->kp);
>>> if (IS_ERR(addr))
>>> return PTR_ERR(addr);
>>> rp->kp.addr = addr;
>>>
>>> ret = check_kprobe_rereg(&rp->kp);
>>> if (WARN_ON(ret))
>>> return ret;
>>>
>>> if (kretprobe_blacklist_size) {
>>> for (i = 0; > > + ret = check_kprobe_rereg(&rp->kp);
>>>
>>>
>>> Thank you,
>>>
>>>
>
next prev parent reply other threads:[~2020-12-15 8:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 11:57 [PATCH] kretprobe: avoid re-registration of the same kretprobe earlier Wang ShaoBo
2020-11-30 21:18 ` Steven Rostedt
2020-12-01 23:32 ` Masami Hiramatsu
2020-12-02 1:23 ` Wangshaobo (bobo)
2020-12-02 1:27 ` Steven Rostedt
2020-12-14 16:36 ` Steven Rostedt
2020-12-15 3:31 ` Masami Hiramatsu
2020-12-15 8:39 ` Wangshaobo (bobo) [this message]
2020-12-21 13:31 ` Wangshaobo (bobo)
2020-12-22 11:03 ` Masami Hiramatsu
2021-01-13 22:48 ` Steven Rostedt
2021-01-14 0:25 ` Masami Hiramatsu
2021-01-14 1:06 ` Wangshaobo (bobo)
2021-01-29 3:37 ` Wangshaobo (bobo)
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=4b1db6c0-2ff3-f163-7d03-ebc594971005@huawei.com \
--to=bobo.shaobowang@huawei.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=cj.chengjian@huawei.com \
--cc=davem@davemloft.net \
--cc=huawei.libin@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=naveen.n.rao@linux.ibm.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;
as well as URLs for NNTP newsgroup(s).