From: Andreas Hindborg <nmi@metaspace.dk>
To: Jens Axboe <axboe@kernel.dk>
Cc: Andreas Hindborg <a.hindborg@samsung.com>,
Keith Busch <kbusch@kernel.org>,
Bart Van Assche <bvanassche@acm.org>,
John Garry <john.g.garry@oracle.com>,
Damien Le Moal <dlemoal@kernel.org>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] null_blk: fix validation of block size
Date: Mon, 3 Jun 2024 21:26:45 +0200 [thread overview]
Message-ID: <20240603192645.977968-1-nmi@metaspace.dk> (raw)
From: Andreas Hindborg <a.hindborg@samsung.com>
Block size should be between 512 and PAGE_SIZE and be a power of 2. The current
check does not validate this, so update the check.
Without this patch, null_blk would Oops due to a null pointer deref when
loaded with bs=1536 [1].
Link: https://lore.kernel.org/all/87wmn8mocd.fsf@metaspace.dk/
Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com>
---
Changes from v2:
- Use blk_validate_block_size instead of open coding the check.
- Change upper bound of chec from 4096 to PAGE_SIZE.
V1: https://lore.kernel.org/all/20240601202351.691952-1-nmi@metaspace.dk/
drivers/block/null_blk/main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index eb023d267369..967d39d191ca 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -1823,8 +1823,9 @@ static int null_validate_conf(struct nullb_device *dev)
dev->queue_mode = NULL_Q_MQ;
}
- dev->blocksize = round_down(dev->blocksize, 512);
- dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
+ if (blk_validate_block_size(dev->blocksize) != 0) {
+ return -EINVAL;
+ }
if (dev->use_per_node_hctx) {
if (dev->submit_queues != nr_online_nodes)
base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
--
2.45.1
next reply other threads:[~2024-06-03 19:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 19:26 Andreas Hindborg [this message]
2024-06-03 19:47 ` Keith Busch
2024-06-04 4:46 ` Christoph Hellwig
2024-06-28 14:30 ` John Garry
2024-06-29 5:07 ` Christoph Hellwig
2024-07-03 12:20 ` blk_validate_limits validation of block size (was Re: [PATCH v2] null_blk: fix validation of block size) John Garry
2024-07-03 13:19 ` Christoph Hellwig
2024-07-03 17:28 ` John Garry
2024-07-04 6:18 ` Christoph Hellwig
2024-06-04 1:27 ` [PATCH v2] null_blk: fix validation of block size Ming Lei
2024-06-04 14:17 ` Jens Axboe
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=20240603192645.977968-1-nmi@metaspace.dk \
--to=nmi@metaspace.dk \
--cc=a.hindborg@samsung.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=dlemoal@kernel.org \
--cc=john.g.garry@oracle.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®