mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

block: fix argument type of bio_trim()

Browse source 
The function bio_trim has offset and size arguments that are declared
as int.

The callers of this function use 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_ONCE() to catch their overflow.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Chaitanya Kulkarni 2021-07-21 21:43:32 +09:00 committed by David Sterba
parent 5662c967c6
commit e83502ca5f
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
block/bio.c
View file

@ -1463,12 +1463,15 @@ EXPORT_SYMBOL(bio_split);
* @bio: bio to trim * @bio: bio to trim
* @offset: number of sectors to trim from the front of @bio * @offset: number of sectors to trim from the front of @bio
* @size: size we want to trim @bio to, in sectors * @size: size we want to trim @bio to, in sectors
*
* This function is typically used for bios that are cloned and submitted
* to the underlying device in parts.
*/ */
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 if (WARN_ON_ONCE(offset > BIO_MAX_SECTORS || size > BIO_MAX_SECTORS ||
* the given offset and size. offset + size > bio->bi_iter.bi_size))
*/ return;
size <<= 9; size <<= 9;
if (offset == 0 && size == bio->bi_iter.bi_size) if (offset == 0 && size == bio->bi_iter.bi_size)
@ -1479,7 +1482,6 @@ void bio_trim(struct bio *bio, int offset, int size)
if (bio_integrity(bio)) if (bio_integrity(bio))
bio_integrity_trim(bio); bio_integrity_trim(bio);
} }
EXPORT_SYMBOL_GPL(bio_trim); EXPORT_SYMBOL_GPL(bio_trim);

2
include/linux/bio.h
View file

@ -375,7 +375,7 @@ static inline void bip_set_seed(struct bio_integrity_payload *bip,
#endif /* CONFIG_BLK_DEV_INTEGRITY */ #endif /* CONFIG_BLK_DEV_INTEGRITY */
extern void bio_trim(struct bio *bio, int offset, int size); void bio_trim(struct bio *bio, sector_t offset, sector_t size);
extern struct bio *bio_split(struct bio *bio, int sectors, extern struct bio *bio_split(struct bio *bio, int sectors,
gfp_t gfp, struct bio_set *bs); gfp_t gfp, struct bio_set *bs);

1
include/linux/blk_types.h
View file

@ -281,6 +281,7 @@ struct bio {
}; };
#define BIO_RESET_BYTES offsetof(struct bio, bi_max_vecs) #define BIO_RESET_BYTES offsetof(struct bio, bi_max_vecs)
#define BIO_MAX_SECTORS (UINT_MAX >> SECTOR_SHIFT)
/* /*
* bio flags * bio flags