Commit 03859717 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: fix bmd->is_null_mapped initialization 



bmd is allocated using kmalloc in bio_alloc_map_data, so make sure
is_null_mapped is properly initialized to false for the !null_mapped
case.

Fixes: f3256075 ("block: remove the BIO_NULL_MAPPED flag")
Reported-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f952eefe

block/blk-map.c

+1 −2
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static int bio_copy_user_iov(struct request *rq, struct rq_map_data *map_data, 
	 * shortlived one.

	 */

	bmd->is_our_pages = !map_data;

	bmd->is_null_mapped = (map_data && map_data->null_mapped);



	nr_pages = DIV_ROUND_UP(offset + len, PAGE_SIZE);

	if (nr_pages > BIO_MAX_PAGES)
@@ -218,8 +219,6 @@ static int bio_copy_user_iov(struct request *rq, struct rq_map_data *map_data, 
	}



	bio->bi_private = bmd;

	if (map_data && map_data->null_mapped)

		bmd->is_null_mapped = true;



	bounce_bio = bio;

	ret = blk_rq_append_bio(rq, &bounce_bio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE