Commit e83502ca authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by David Sterba
Browse files

block: fix argument type of bio_trim() 



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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5662c967

block/bio.c

+7 −5
Original line number Diff line number Diff line
@@ -1463,12 +1463,15 @@ EXPORT_SYMBOL(bio_split); 
 * @bio:	bio to trim

 * @offset:	number of sectors to trim from the front of @bio

 * @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

	 * the given offset and size.

	 */

	if (WARN_ON_ONCE(offset > BIO_MAX_SECTORS || size > BIO_MAX_SECTORS ||

			 offset + size > bio->bi_iter.bi_size))

		return;



	size <<= 9;

	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))

		bio_integrity_trim(bio);



}

EXPORT_SYMBOL_GPL(bio_trim);

include/linux/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,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);

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);

include/linux/blk_types.h

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ struct bio { 
};



#define BIO_RESET_BYTES		offsetof(struct bio, bi_max_vecs)

#define BIO_MAX_SECTORS		(UINT_MAX >> SECTOR_SHIFT)



/*

 * bio flags