From: Min Li <min15.li@samsung.com>
To: axboe@kernel.dk, willy@infradead.org, hch@lst.de,
dlemoal@kernel.org, gregkh@linuxfoundation.org
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@kernel.org, Min Li <min15.li@samsung.com>
Subject: [PATCH v3] block: add check that partition length needs to be aligned with block size
Date: Wed, 28 Jun 2023 13:09:41 +0000 [thread overview]
Message-ID: <20230628130941.10690-1-min15.li@samsung.com> (raw)
In-Reply-To: CGME20230628051122epcas5p45d70f2c36ce91b60863f702de1534321@epcas5p4.samsung.com
Before calling add partition or resize partition, there is no check
on whether the length is aligned with the logical block size.
If the logical block size of the disk is larger than 512 bytes,
then the partition size maybe not the multiple of the logical block size,
and when the last sector is read, bio_truncate() will adjust the bio size,
resulting in an IO error if the size of the read command is smaller than
the logical block size.If integrity data is supported, this will also
result in a null pointer dereference when calling bio_integrity_free.
Signed-off-by: Min Li <min15.li@samsung.com>
---
Changes from v1:
- Add a space after /* and before */.
- Move length alignment check before the "start = p.start >> SECTOR_SHIFT"
- Move check for p.start being aligned together with this length alignment check.
Changes from v2:
- Add the assignment on the first line and merge the two lines into one.
- Use IS_ALIGNED function to check alignment.
---
block/ioctl.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/ioctl.c b/block/ioctl.c
index 3be11941fb2d..1a351132bf4e 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -16,9 +16,9 @@
static int blkpg_do_ioctl(struct block_device *bdev,
struct blkpg_partition __user *upart, int op)
{
+ long long blksz = bdev_logical_block_size(bdev), start, length;
struct gendisk *disk = bdev->bd_disk;
struct blkpg_partition p;
- long long start, length;
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
@@ -33,14 +33,15 @@ static int blkpg_do_ioctl(struct block_device *bdev,
if (op == BLKPG_DEL_PARTITION)
return bdev_del_partition(disk, p.pno);
+ /* Check that the partition is aligned to the block size */
+ if (!IS_ALIGNED(p.start | p.length, blksz))
+ return -EINVAL;
+
start = p.start >> SECTOR_SHIFT;
length = p.length >> SECTOR_SHIFT;
switch (op) {
case BLKPG_ADD_PARTITION:
- /* check if partition is aligned to blocksize */
- if (p.start & (bdev_logical_block_size(bdev) - 1))
- return -EINVAL;
return bdev_add_partition(disk, p.pno, start, length);
case BLKPG_RESIZE_PARTITION:
return bdev_resize_partition(disk, p.pno, start, length);
--
2.34.1
next parent reply other threads:[~2023-06-28 8:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20230628051122epcas5p45d70f2c36ce91b60863f702de1534321@epcas5p4.samsung.com>
2023-06-28 13:09 ` Min Li [this message]
2023-06-28 6:05 ` [PATCH v3] block: add check that partition length needs to be aligned with block size Damien Le Moal
2023-06-28 7:32 ` Christoph Hellwig
2023-06-28 16:34 ` Min Li
2023-06-28 8:38 ` Christoph Hellwig
2023-06-28 17:07 ` Min Li
2023-06-29 1:04 ` Chaitanya Kulkarni
2023-06-29 1:04 ` Yu Kuai
2023-06-29 1:15 ` Damien Le Moal
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=20230628130941.10690-1-min15.li@samsung.com \
--to=min15.li@samsung.com \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@kernel.org \
--cc=willy@infradead.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