From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>,
Zhang Wensheng <zhangwensheng@huaweicloud.com>,
Zhong Jinghua <zhongjinghua@huawei.com>,
Hillf Danton <hdanton@sina.com>, Yu Kuai <yukuai3@huawei.com>,
Dennis Zhou <dennis@kernel.org>
Subject: [PATCH] block: fix use-after-free of q->q_usage_counter
Date: Thu, 15 Dec 2022 10:16:29 +0800 [thread overview]
Message-ID: <20221215021629.74870-1-ming.lei@redhat.com> (raw)
For blk-mq, queue release handler is usually called into after
blk_mq_freeze_queue_wait() returns. However, q_usage_counter->release()
handler may not be started yet at that time, so cause user-after-free.
Fix the issue by moving percpu_ref_exit() into blk_free_queue_rcu()
since ->release() is called with rcu read lock held, since it is
concluded that the race should be covered in caller per discussion
from the two links.
Reported-by: Zhang Wensheng <zhangwensheng@huaweicloud.com>
Reported-by: Zhong Jinghua <zhongjinghua@huawei.com>
Link: https://lore.kernel.org/linux-block/Y5prfOjyyjQKUrtH@T590/T/#u
Link: https://lore.kernel.org/lkml/Y4%2FmzMd4evRg9yDi@fedora/
Cc: Hillf Danton <hdanton@sina.com>
Cc: Yu Kuai <yukuai3@huawei.com>
Cc: Dennis Zhou <dennis@kernel.org>
Fixes: 2b0d3d3e4fcf ("percpu_ref: reduce memory footprint of percpu_ref in fast path")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 3866b6c4cd88..9321767470dc 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -254,14 +254,15 @@ EXPORT_SYMBOL_GPL(blk_clear_pm_only);
static void blk_free_queue_rcu(struct rcu_head *rcu_head)
{
- kmem_cache_free(blk_requestq_cachep,
- container_of(rcu_head, struct request_queue, rcu_head));
+ struct request_queue *q = container_of(rcu_head,
+ struct request_queue, rcu_head);
+
+ percpu_ref_exit(&q->q_usage_counter);
+ kmem_cache_free(blk_requestq_cachep, q);
}
static void blk_free_queue(struct request_queue *q)
{
- percpu_ref_exit(&q->q_usage_counter);
-
if (q->poll_stat)
blk_stat_remove_callback(q, q->poll_cb);
blk_stat_free_callback(q->poll_cb);
--
2.31.1
next reply other threads:[~2022-12-15 2:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 2:16 Ming Lei [this message]
2022-12-15 12:25 ` [PATCH] block: fix use-after-free of q->q_usage_counter Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2023-09-21 18:20 Saranya Muruganandam
2023-09-22 1:09 ` Ming Lei
2023-09-22 9:26 ` Greg KH
2023-09-22 18:21 ` Saranya Muruganandam
2023-10-07 10:22 ` Greg KH
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=20221215021629.74870-1-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=dennis@kernel.org \
--cc=hdanton@sina.com \
--cc=linux-block@vger.kernel.org \
--cc=yukuai3@huawei.com \
--cc=zhangwensheng@huaweicloud.com \
--cc=zhongjinghua@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