From: Kemeng Shi <shikemeng@huawei.com>
To: <tj@kernel.org>, <axboe@kernel.dk>
Cc: <cgroups@vger.kernel.org>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <shikemeng@huawei.com>
Subject: [PATCH 3/4] blk-cgroup: Add NULL check of pd_alloc_fn in blkcg_activate_policy
Date: Mon, 10 Oct 2022 10:38:58 +0800 [thread overview]
Message-ID: <20221010023859.11896-4-shikemeng@huawei.com> (raw)
In-Reply-To: <20221010023859.11896-1-shikemeng@huawei.com>
Function blkcg_policy_register only make sure pd_alloc_fn and pd_free_fn in
pairs, so pd_alloc_fn could be NULL in registered blkcg_policy. Check NULL
before use for pd_alloc_fn in blkcg_activate_policy to avoid protential
NULL dereference.
Signed-off-by: Kemeng Shi <shikemeng@huawei.com>
---
block/blk-cgroup.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 463c568d3e86..fc083c35dc42 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1404,6 +1404,9 @@ int blkcg_activate_policy(struct request_queue *q,
if (blkcg_policy_enabled(q, pol))
return 0;
+ if (pol->pd_alloc_fn == NULL)
+ return -EINVAL;
+
if (queue_is_mq(q))
blk_mq_freeze_queue(q);
retry:
--
2.30.0
next prev parent reply other threads:[~2022-10-10 2:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 2:38 [PATCH 0/4] A few cleanup patches for blk-cgroup Kemeng Shi
2022-10-10 2:38 ` [PATCH 1/4] blk-cgroup: Remove unnecessary blk_ioprio_exit in blkcg_init_queue Kemeng Shi
2022-10-10 7:37 ` Christoph Hellwig
2022-10-11 1:04 ` Kemeng Shi
2022-10-10 2:38 ` [PATCH 2/4] blk-cgroup: correct comment for blk_alloc_queue and blk_exit_queue Kemeng Shi
2022-10-10 20:26 ` Tejun Heo
2022-10-11 1:07 ` Kemeng Shi
2022-10-10 2:38 ` Kemeng Shi [this message]
2022-10-10 20:29 ` [PATCH 3/4] blk-cgroup: Add NULL check of pd_alloc_fn in blkcg_activate_policy Tejun Heo
2022-10-11 1:23 ` Kemeng Shi
2022-10-11 7:53 ` Yu Kuai
2022-10-10 2:38 ` [PATCH 4/4] blk-cgroup: Fix typo in comment Kemeng Shi
2022-10-10 20:29 ` Tejun Heo
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=20221010023859.11896-4-shikemeng@huawei.com \
--to=shikemeng@huawei.com \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.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