block: modify bio_integrity_map_user to accept iov_iter as argument

[ Upstream commit fe8f4ca7107e968b0eb7328155c8811f2a19424a ]

This patch refactors bio_integrity_map_user to accept iov_iter as
argument. This is a prep patch.

Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20241128112240.8867-4-anuj20.g@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 8582792cf23b ("block: bio-integrity: Fix null-ptr-deref in bio_integrity_map_user()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 9c490fa07a795a56dc4059a0c8f8ff2b768b709e..785adefc5f3c3aac70dfa759d61af9ceee79cbd7 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -298,16 +298,15 @@ static unsigned int bvec_from_pages(struct bio_vec *bvec, struct page **pages,
        return nr_bvecs;
 }
 
-int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes)
+int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
 {
        struct request_queue *q = bdev_get_queue(bio->bi_bdev);
        unsigned int align = blk_lim_dma_alignment_and_pad(&q->limits);
        struct page *stack_pages[UIO_FASTIOV], **pages = stack_pages;
        struct bio_vec stack_vec[UIO_FASTIOV], *bvec = stack_vec;
+       size_t offset, bytes = iter->count;
        unsigned int direction, nr_bvecs;
-       struct iov_iter iter;
        int ret, nr_vecs;
-       size_t offset;
        bool copy;
 
        if (bio_integrity(bio))
@@ -320,8 +319,7 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes)
        else
                direction = ITER_SOURCE;
 
-       iov_iter_ubuf(&iter, direction, ubuf, bytes);
-       nr_vecs = iov_iter_npages(&iter, BIO_MAX_VECS + 1);
+       nr_vecs = iov_iter_npages(iter, BIO_MAX_VECS + 1);
        if (nr_vecs > BIO_MAX_VECS)
                return -E2BIG;
        if (nr_vecs > UIO_FASTIOV) {
@@ -331,8 +329,8 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes)
                pages = NULL;
        }
 
-       copy = !iov_iter_is_aligned(&iter, align, align);
-       ret = iov_iter_extract_pages(&iter, &pages, bytes, nr_vecs, 0, &offset);
+       copy = !iov_iter_is_aligned(iter, align, align);
+       ret = iov_iter_extract_pages(iter, &pages, bytes, nr_vecs, 0, &offset);
        if (unlikely(ret < 0))
                goto free_bvec;
 

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 013469faa5e7c4e2592d22882a91a09bccd252eb..a1678f0a9f81f9bd47c70e1d07fc095669a0978e 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -115,8 +115,16 @@ EXPORT_SYMBOL(blk_rq_map_integrity_sg);
 int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,
                              ssize_t bytes)
 {
-       int ret = bio_integrity_map_user(rq->bio, ubuf, bytes);
+       int ret;
+       struct iov_iter iter;
+       unsigned int direction;
 
+       if (op_is_write(req_op(rq)))
+               direction = ITER_DEST;
+       else
+               direction = ITER_SOURCE;
+       iov_iter_ubuf(&iter, direction, ubuf, bytes);
+       ret = bio_integrity_map_user(rq->bio, &iter);
        if (ret)
                return ret;
 

diff --git a/include/linux/bio-integrity.h b/include/linux/bio-integrity.h
index dbf0f74c15291327c11af3c393386ec13cc3906f..be91479b2c42d51dfdc4210cace5eba6fe879f5a 100644 (file)
--- a/include/linux/bio-integrity.h
+++ b/include/linux/bio-integrity.h
@@ -72,7 +72,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, gfp_t gfp,
                unsigned int nr);
 int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,
                unsigned int offset);
-int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t len);
+int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter);
 void bio_integrity_unmap_user(struct bio *bio);
 bool bio_integrity_prep(struct bio *bio);
 void bio_integrity_advance(struct bio *bio, unsigned int bytes_done);
@@ -98,8 +98,7 @@ static inline void bioset_integrity_free(struct bio_set *bs)
 {
 }
 
-static inline int bio_integrity_map_user(struct bio *bio, void __user *ubuf,
-                                        ssize_t len)
+static int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
 {
        return -EINVAL;
 }