From: Naohiro Aota <naohiro.aota@wdc.com>
To: linux-btrfs@vger.kernel.org, linux-block@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Naohiro Aota <naohiro.aota@wdc.com>
Subject: [PATCH v2 1/3] block: fix arg type of bio_trim()
Date: Wed, 21 Jul 2021 15:26:58 +0900 [thread overview]
Message-ID: <6bd02746905e41dfee04f2500d6d15f9b9b73fc9.1626848677.git.naohiro.aota@wdc.com> (raw)
In-Reply-To: <cover.1626848677.git.naohiro.aota@wdc.com>
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
The function bio_trim has offset and size arguments that are declared
as int.
The callers of this function uses sector_t type when passing the offset
and size e,g. drivers/md/raid1.c:narrow_write_error() and
drivers/md/raid1.c:narrow_write_error().
Change offset and size arguments to sector_t type for bio_trim(). Also, add
WARN_ON() to catch their overflow.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
---
block/bio.c | 14 +++++++++++---
include/linux/bio.h | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/block/bio.c b/block/bio.c
index 44205dfb6b60..69a9751b18e7 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1465,12 +1465,20 @@ EXPORT_SYMBOL(bio_split);
* @offset: number of sectors to trim from the front of @bio
* @size: size we want to trim @bio to, in sectors
*/
-void bio_trim(struct bio *bio, int offset, int size)
+void bio_trim(struct bio *bio, sector_t offset, sector_t size)
{
- /* 'bio' is a cloned bio which we need to trim to match
- * the given offset and size.
+ const sector_t uint_max_sectors = UINT_MAX >> SECTOR_SHIFT;
+
+ /*
+ * 'bio' is a cloned bio which we need to trim to match the given
+ * offset and size.
*/
+ /* sanity check */
+ if (WARN_ON(offset > uint_max_sectors || size > uint_max_sectors ||
+ offset + size > bio->bi_iter.bi_size))
+ return;
+
size <<= 9;
if (offset == 0 && size == bio->bi_iter.bi_size)
return;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index a0b4cfdf62a4..c91bc70add06 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -379,7 +379,7 @@ static inline void bip_set_seed(struct bio_integrity_payload *bip,
#endif /* CONFIG_BLK_DEV_INTEGRITY */
-extern void bio_trim(struct bio *bio, int offset, int size);
+extern void bio_trim(struct bio *bio, sector_t offset, sector_t size);
extern struct bio *bio_split(struct bio *bio, int sectors,
gfp_t gfp, struct bio_set *bs);
--
2.32.0
next prev parent reply other threads:[~2021-07-21 6:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 6:26 [PATCH v2 0/3] fix argument type of bio_trim() Naohiro Aota
2021-07-21 6:26 ` Naohiro Aota [this message]
2021-07-21 6:36 ` [PATCH v2 1/3] block: fix arg " Christoph Hellwig
2021-07-21 11:47 ` Naohiro Aota
2021-07-21 6:26 ` [PATCH v2 2/3] btrfs: fix argument type of btrfs_bio_clone_partial() Naohiro Aota
2021-07-21 6:37 ` Christoph Hellwig
2021-07-21 12:33 ` Naohiro Aota
2021-07-21 6:27 ` [PATCH v2 3/3] btrfs: drop unnecessary ASSERT from btrfs_submit_direct() Naohiro Aota
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=6bd02746905e41dfee04f2500d6d15f9b9b73fc9.1626848677.git.naohiro.aota@wdc.com \
--to=naohiro.aota@wdc.com \
--cc=axboe@kernel.dk \
--cc=chaitanya.kulkarni@wdc.com \
--cc=dsterba@suse.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@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;
as well as URLs for NNTP newsgroup(s).