From: Yu Kuai <yukuai1@huaweicloud.com>
To: Logan Gunthorpe <logang@deltatee.com>,
Yu Kuai <yukuai1@huaweicloud.com>,
song@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
yi.zhang@huawei.com, yangerkun@huawei.com,
"yukuai (C)" <yukuai3@huawei.com>
Subject: Re: [PATCH -next v5 6/6] md: protect md_thread with rcu
Date: Tue, 11 Apr 2023 09:08:14 +0800 [thread overview]
Message-ID: <1f5c8b12-5eb7-4e67-abac-5bead8382c6d@huaweicloud.com> (raw)
In-Reply-To: <87c0efd2-c8b0-c6ab-764c-958883fe1d15@deltatee.com>
Hi,
在 2023/04/10 23:42, Logan Gunthorpe 写道:
>
>
> On 2023-04-10 05:35, Yu Kuai wrote:
>> From: Yu Kuai <yukuai3@huawei.com>
>>
>> Our test reports a uaf for 'mddev->sync_thread':
>>
>> T1 T2
>> md_start_sync
>> md_register_thread
>> // mddev->sync_thread is set
>> raid1d
>> md_check_recovery
>> md_reap_sync_thread
>> md_unregister_thread
>> kfree
>>
>> md_wakeup_thread
>> wake_up
>> ->sync_thread was freed
>>
>> Root cause is that there is a small windown between register thread and
>> wake up thread, where the thread can be freed concurrently.
>>
>> Currently, a global spinlock 'pers_lock' is borrowed to protect
>> 'mddev->thread', this problem can be fixed likewise, however, there might
>> be similar problem elsewhere, and use a global lock for all the cases is
>> not good.
>>
>> This patch protect md_thread with rcu.
>>
>> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>> ---
>> drivers/md/md-bitmap.c | 29 ++++++++++++-----
>> drivers/md/md.c | 68 +++++++++++++++++++---------------------
>> drivers/md/md.h | 10 +++---
>> drivers/md/raid1.c | 4 +--
>> drivers/md/raid1.h | 2 +-
>> drivers/md/raid10.c | 10 ++++--
>> drivers/md/raid10.h | 2 +-
>> drivers/md/raid5-cache.c | 15 +++++----
>> drivers/md/raid5.c | 4 +--
>> drivers/md/raid5.h | 2 +-
>> 10 files changed, 81 insertions(+), 65 deletions(-)
>>
>> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
>> index 29fd41ef55a6..b9baeea5605e 100644
>> --- a/drivers/md/md-bitmap.c
>> +++ b/drivers/md/md-bitmap.c
>> @@ -1219,15 +1219,27 @@ static bitmap_counter_t *md_bitmap_get_counter(struct bitmap_counts *bitmap,
>> int create);
>>
>> static void mddev_set_timeout(struct mddev *mddev, unsigned long timeout,
>> - bool force)
>> + bool force, bool protected)
>> {
>> - struct md_thread *thread = mddev->thread;
>> + struct md_thread *thread;
>> +
>> + if (!protected) {
>> + rcu_read_lock();
>> + thread = rcu_dereference(mddev->thread);
>> + } else {
>> + thread = rcu_dereference_protected(mddev->thread,
>> + lockdep_is_held(&mddev->reconfig_mutex));
>> + }
>
> Why not just always use rcu_read_lock()? Even if it's safe with
> reconfig_mutex, it wouldn't harm much and would make the code a bit less
> ugly.
>
Of course, I'll do that in next version.
>
>> @@ -458,8 +454,10 @@ static void md_submit_bio(struct bio *bio)
>> */
>> void mddev_suspend(struct mddev *mddev)
>> {
>> - WARN_ON_ONCE(mddev->thread && current == mddev->thread->tsk);
>> - lockdep_assert_held(&mddev->reconfig_mutex);
>> + struct md_thread *thread = rcu_dereference_protected(mddev->thread,
>> + lockdep_is_held(&mddev->reconfig_mutex));
>
> Do we know that reconfig_mutex is always held when we call
> md_unregister_thread()? Seems plausible, but maybe it's worth adding a
> lockdep_assert_held() to md_unregsiter_thread().
Unfortunally this is not true for now, md_unregister_thread() can be
called without this mutex from action_store(), and this is problematic,
I'm tring to revert this change in the other thread:
md: fix that MD_RECOVERY_RUNNING can be cleared while sync_thread is
still running.
I think it's not good to add lockdep_assert_held() for now...
Thanks,
Kuai
>
> Thanks,
>
> Logan
> .
>
prev parent reply other threads:[~2023-04-11 1:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 11:35 [PATCH -next v5 0/6] md: fix uaf for sync_thread Yu Kuai
2023-04-10 11:35 ` [PATCH -next v5 1/6] md: pass a md_thread pointer to md_register_thread() Yu Kuai
2023-04-11 1:15 ` Song Liu
2023-04-11 1:34 ` Yu Kuai
2023-04-11 5:26 ` Song Liu
2023-04-11 15:46 ` Logan Gunthorpe
2023-04-12 9:23 ` Yu Kuai
2023-04-10 11:35 ` [PATCH -next v5 2/6] md: factor out a helper to wake up md_thread directly Yu Kuai
2023-04-10 11:35 ` [PATCH -next v5 3/6] dm-raid: remove useless checking in raid_message() Yu Kuai
2023-04-10 11:35 ` [PATCH -next v5 4/6] md/bitmap: always wake up md_thread in timeout_store Yu Kuai
2023-04-10 11:35 ` [PATCH -next v5 5/6] md/bitmap: factor out a helper to set timeout Yu Kuai
2023-04-10 11:35 ` [PATCH -next v5 6/6] md: protect md_thread with rcu Yu Kuai
2023-04-10 15:42 ` Logan Gunthorpe
2023-04-11 1:08 ` Yu Kuai [this message]
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=1f5c8b12-5eb7-4e67-abac-5bead8382c6d@huaweicloud.com \
--to=yukuai1@huaweicloud.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=song@kernel.org \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.com \
/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
all inboxes | Powered by JetHome®