* [PATCH] block: fix bmd->is_null_mapped initialization
@ 2020-09-23 15:07 Christoph Hellwig
2020-09-23 15:19 ` Jens Axboe
2020-09-23 16:34 ` Marc Hartmayer
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Hellwig @ 2020-09-23 15:07 UTC (permalink / raw)
To: axboe; +Cc: mhartmay, linux-block
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: f3256075ba49 ("block: remove the BIO_NULL_MAPPED flag")
Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-map.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/blk-map.c b/block/blk-map.c
index be118926ccf4e3..21630dccac628c 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -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);
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] block: fix bmd->is_null_mapped initialization
2020-09-23 15:07 [PATCH] block: fix bmd->is_null_mapped initialization Christoph Hellwig
@ 2020-09-23 15:19 ` Jens Axboe
2020-09-23 16:34 ` Marc Hartmayer
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2020-09-23 15:19 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: mhartmay, linux-block
On 9/23/20 9:07 AM, Christoph Hellwig wrote:
> 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.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] block: fix bmd->is_null_mapped initialization
2020-09-23 15:07 [PATCH] block: fix bmd->is_null_mapped initialization Christoph Hellwig
2020-09-23 15:19 ` Jens Axboe
@ 2020-09-23 16:34 ` Marc Hartmayer
1 sibling, 0 replies; 3+ messages in thread
From: Marc Hartmayer @ 2020-09-23 16:34 UTC (permalink / raw)
To: Christoph Hellwig, axboe; +Cc: mhartmay, linux-block
On Wed, Sep 23, 2020 at 05:07 PM +0200, Christoph Hellwig <hch@lst.de> wrote:
> 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: f3256075ba49 ("block: remove the BIO_NULL_MAPPED flag")
> Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-map.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/block/blk-map.c b/block/blk-map.c
> index be118926ccf4e3..21630dccac628c 100644
> --- a/block/blk-map.c
> +++ b/block/blk-map.c
> @@ -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);
> --
> 2.28.0
Tested-by: Marc Hartmayer <mhartmay@linux.ibm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-23 16:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-23 15:07 [PATCH] block: fix bmd->is_null_mapped initialization Christoph Hellwig
2020-09-23 15:19 ` Jens Axboe
2020-09-23 16:34 ` Marc Hartmayer
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).