]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
block: flip iter directions in blk_rq_integrity_map_user()
authorCaleb Sander Mateos <csander@purestorage.com>
Tue, 3 Jun 2025 18:47:51 +0000 (12:47 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 3 Jun 2025 23:24:59 +0000 (17:24 -0600)
blk_rq_integrity_map_user() creates the ubuf iter with ITER_DEST for
write-direction operations and ITER_SOURCE for read-direction ones.
This is backwards; writes use the user buffer as a source for metadata
and reads use it as a destination. Switch to the rq_data_dir() helper,
which maps writes to ITER_SOURCE (WRITE) and reads to ITER_DEST(READ).

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Fixes: fe8f4ca7107e ("block: modify bio_integrity_map_user to accept iov_iter as argument")
Link: https://lore.kernel.org/r/20250603184752.1185676-1-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-integrity.c

index a1678f0a9f81f9bd47c70e1d07fc095669a0978e..e4e2567061f9dbefbffe4e8c0fe61e58aa0966dc 100644 (file)
@@ -117,13 +117,8 @@ int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,
 {
        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);
+       iov_iter_ubuf(&iter, rq_data_dir(rq), ubuf, bytes);
        ret = bio_integrity_map_user(rq->bio, &iter);
        if (ret)
                return ret;