mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexander Atanasov <alex@zazolabs.com>
To: Caleb Sander Mateos <csander@purestorage.com>,
	Ming Lei <ming.lei@redhat.com>, Jens Axboe <axboe@kernel.dk>,
	Shuah Khan <shuah@kernel.org>
Cc: linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Stanley Zhang <stazhang@purestorage.com>,
	Uday Shankar <ushankar@purestorage.com>,
	"Martin K . Petersen" <martin.petersen@oracle.com>
Subject: Re: [PATCH v4 08/19] ublk: move offset check out of __ublk_check_and_get_req()
Date: Mon, 12 Jan 2026 20:17:44 +0200	[thread overview]
Message-ID: <f0c205d9-609f-4b08-af67-3d8730eb6fce@zazolabs.com> (raw)
In-Reply-To: <20260108091948.1099139-9-csander@purestorage.com>

On 8.01.26 11:19, Caleb Sander Mateos wrote:
> __ublk_check_and_get_req() checks that the passed in offset is within
> the data length of the specified ublk request. However, only user copy
> (ublk_check_and_get_req()) supports accessing ublk request data at a
> nonzero offset. Zero-copy buffer registration (ublk_register_io_buf())
> always passes 0 for the offset, so the check is unnecessary. Move the
> check from __ublk_check_and_get_req() to ublk_check_and_get_req().
> 
> Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
> Reviewed-by: Ming Lei <ming.lei@redhat.com>
> ---
>   drivers/block/ublk_drv.c | 16 +++++++++-------
>   1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
> index e7697dc4a812..8eefb838b563 100644
> --- a/drivers/block/ublk_drv.c
> +++ b/drivers/block/ublk_drv.c
> @@ -253,11 +253,11 @@ struct ublk_params_header {
>   

[snip]

> @@ -2603,13 +2603,10 @@ static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
>   		goto fail_put;
>   
>   	if (!ublk_rq_has_data(req))
>   		goto fail_put;
>   
> -	if (offset > blk_rq_bytes(req))
> -		goto fail_put;
> -
>   	return req;
>   fail_put:
>   	ublk_put_req_ref(io, req);
>   	return NULL;
>   }
> @@ -2687,14 +2684,19 @@ ublk_user_copy(struct kiocb *iocb, struct iov_iter *iter, int dir)
>   
>   	if (tag >= ub->dev_info.queue_depth)
>   		return -EINVAL;
>   
>   	io = &ubq->ios[tag];
> -	req = __ublk_check_and_get_req(ub, q_id, tag, io, buf_off);
> +	req = __ublk_check_and_get_req(ub, q_id, tag, io);
>   	if (!req)
>   		return -EINVAL;
>   
> +	if (buf_off > blk_rq_bytes(req)) {
> +		ret = -EINVAL;
> +		goto out;
> +	}
> +

Offset is zero based, bytes are count so it should be >= here.

It will work this way but for buf_off == blk_rq_bytes(req) user will get 
0 instead of EINVAL.

static size_t ublk_copy_user_pages(const struct request *req,
                 unsigned offset, struct iov_iter *uiter, int dir)
{
	size_t done = 0;
...
         rq_for_each_segment(bv, req, iter) {
...
                 if (offset >= bv.bv_len) {
                         offset -= bv.bv_len; // bv_len is same as 
blk_rq_bytes(req)
                         continue; // this breaks the loop when ==
                 }
...
	}
	return done; // done is never incremented
}

>   	if (!ublk_check_ubuf_dir(req, dir)) {
>   		ret = -EACCES;
>   		goto out;
>   	}


-- 
have fun,
alex


  reply	other threads:[~2026-01-12 18:17 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-08  9:19 [PATCH v4 00/19] ublk: add support for integrity data Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 01/19] blk-integrity: take const pointer in blk_integrity_rq() Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 02/19] ublk: move ublk flag check functions earlier Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 03/19] ublk: support UBLK_PARAM_TYPE_INTEGRITY in device creation Caleb Sander Mateos
2026-01-08 12:14   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 04/19] ublk: set UBLK_IO_F_INTEGRITY in ublksrv_io_desc Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 05/19] ublk: split out ublk_copy_user_bvec() helper Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 06/19] ublk: split out ublk_user_copy() helper Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 07/19] ublk: inline ublk_check_and_get_req() into ublk_user_copy() Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 08/19] ublk: move offset check out of __ublk_check_and_get_req() Caleb Sander Mateos
2026-01-12 18:17   ` Alexander Atanasov [this message]
2026-01-12 18:29     ` Caleb Sander Mateos
2026-01-12 19:44       ` Alexander Atanasov
2026-01-08  9:19 ` [PATCH v4 09/19] ublk: implement integrity user copy Caleb Sander Mateos
2026-01-08 12:19   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 10/19] ublk: support UBLK_F_INTEGRITY Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 11/19] ublk: optimize ublk_user_copy() on daemon task Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 12/19] selftests: ublk: display UBLK_F_INTEGRITY support Caleb Sander Mateos
2026-01-08  9:19 ` [PATCH v4 13/19] selftests: ublk: add utility to get block device metadata size Caleb Sander Mateos
2026-01-08 12:21   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 14/19] selftests: ublk: add kublk support for integrity params Caleb Sander Mateos
2026-01-08 12:23   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 15/19] selftests: ublk: implement integrity user copy in kublk Caleb Sander Mateos
2026-01-08 12:27   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 16/19] selftests: ublk: support non-O_DIRECT backing files Caleb Sander Mateos
2026-01-08 12:35   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 17/19] selftests: ublk: add integrity data support to loop target Caleb Sander Mateos
2026-01-08 12:42   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 18/19] selftests: ublk: add integrity params test Caleb Sander Mateos
2026-01-08 12:45   ` Ming Lei
2026-01-08  9:19 ` [PATCH v4 19/19] selftests: ublk: add end-to-end integrity test Caleb Sander Mateos
2026-01-08 12:46   ` Ming Lei
2026-01-12 14:45 ` [PATCH v4 00/19] ublk: add support for integrity data Ming Lei
2026-01-12 16:22 ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f0c205d9-609f-4b08-af67-3d8730eb6fce@zazolabs.com \
    --to=alex@zazolabs.com \
    --cc=alex+zkern@zazolabs.com \
    --cc=axboe@kernel.dk \
    --cc=csander@purestorage.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=ming.lei@redhat.com \
    --cc=shuah@kernel.org \
    --cc=stazhang@purestorage.com \
    --cc=ushankar@purestorage.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®