From nobody Sat Feb 7 15:12:08 2026 Received: from mail-vk1-f225.google.com (mail-vk1-f225.google.com [209.85.221.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5628821C9FD for ; Tue, 6 Jan 2026 00:58:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767661096; cv=none; b=AGFXismqTh+z+PQEr5fAIDgMvxv2N8x6K1klQ/2VmVldvdYAYUNCoSVYYk4TKvmQsQhJshI1zHlyA1LeU7jvZrv/pvMTRrj7dhxa3rE8NvC99isdxOYqemO2cbcE9N3FdvmAGUlPn9D5KJSDwFVjOOLwo2nCaFP8xVEcxRkuyis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767661096; c=relaxed/simple; bh=O2B3nDNTOvA1fCnP/c4U5ok+FRqPgHkTWB1k6b6wlJU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=amTKSH18rEYgSrUDqQdkHStMgX0HwQdfJqtI53vfxprEzLqPdhMhkvB54i39otdzgpSOZfh5echXChXtD3IL5n+jY8pyp6YjOPkUM+B0tOik/89JUaArKDh/vKyEzJrkX2Or0pCSQ3yqWINZY/gH0n72Np7iyuVLF0QwY3vsAEI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=bwkToi3f; arc=none smtp.client-ip=209.85.221.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="bwkToi3f" Received: by mail-vk1-f225.google.com with SMTP id 71dfb90a1353d-55b2cfc3d9cso15246e0c.1 for ; Mon, 05 Jan 2026 16:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1767661090; x=1768265890; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2CNvd1Mx9gekfNSEieO/2PmHTz2A3J9iRZA5969nWLY=; b=bwkToi3ffW+XgrVvqlWjfWxLeL9npKDt1fU3v1x7w502dIRkT9XPfWHSc1662qTSGX 1+eLhvYv0Bx+TBIuo16oT1Mzid9CT/u7eWIANZ5Yk2EaReHQyzUzJNtMo57wa8iBKryK LO/rymVyJXv7sb2BIizNDT3RYARCYzM1f6HOTSNzKMJa7tPyjRUZAaz6Etw+8pvrVnK/ FyoYfEesE0jiPY9QY2yAMlqOi6ub3LrFH0/5vAd1cyra6/TfeTGzTgdN/L3c0kBim0sW y8KkeL+npFWW1cy4bc6Nf6Ii0+Xv7Zbd06GoB39Pdev2IvjKBhiGpjkrzm2uoqKUvAUa GwVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767661090; x=1768265890; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2CNvd1Mx9gekfNSEieO/2PmHTz2A3J9iRZA5969nWLY=; b=kCUdLd1Pogh89Kdo3+YUxSzMRV5igUakXR09oemQxUQiobV9Bc34KGHLjsAbrjktR6 tKJ/OZ3STro103eP22pVg2KPkzKmSrWLTJpviTNhpMjDQwY3wQN2o09w7mLobzBGRQpB GldrwJ7/7hFxS6p6eh9tZ8lrr4V16yVks4G4l7a64rPXbGDbypCJ/5Af9BsHNOZrgrWf nA8g14rPocrdm9rXw87bGQjWkpxviZN0Gvh7pJFV9LQHmoY+CYV5G/ix+KUC1CusXNt+ vEnLzP+bLi4ztjdIoYDaXbecoZyasotrZZDKfxsV6uKJWp6u+7Va0xGBL3v5OsGvrQ0s 7mnA== X-Forwarded-Encrypted: i=1; AJvYcCXdKWpHeBW2MMGaU4JCJYAAAPnCsWp8SXGLvEbe73ljezEmtVa5jBAxhVFTpSPTT5bhnqW682Jp0B7tQbY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5tyUrFJu+IynWih8CJzILrZqnB0PHg+86D+lL6NCsZ7MzcRVt 48ZgFZeN+hH46BIJoziT5UNOTV6Mq29Ja8HmCWy02C3aeuetsOIRbAAxuYVX2rNbMRP8pUTo4qc 2kRYxlanDserRNoCNgFrdP1fdqJ8LYCJtqrqlx1BVIUEIXAQdNB6I X-Gm-Gg: AY/fxX68/EQeicqbSOGDT01RqqqPtPDOTos9PrbFT5uNihAz9vGdcOx7Ws9coJ2dFjI a+gN0qSDOjdFQ51RqQOnqDYELzcOd8KBhVpsrzlwGxuQXWag7oOspody7TrI3yLRiM/pWF7B01Q pv/n1xDiRDSC/fZbMKZ+Voh8W1q7SaaTw1hd3cWafXNOxbhdFo/tnK4rNSQd2SnDQqXXGaDWbHy b2qKcKIJjxxKQZAr/jmiWDaNZE+ltUN+9KRNGkEETNoHsclvYpKE9RZIense28XKpIUqK1NMbnP orqqtcTSC9/vLNk4ML+bf9JF0lAIf7K3RdjsHGH2eldMiMJnwQfeKD44pungvx0On76gYxrsSju Bd/hsHzq1fSzgvgRgyFZQRrexnK4= X-Google-Smtp-Source: AGHT+IH8mCx6YKDu+wL7IQQyl+rfNWEG6hhp/rXOGPYtOLg3VYxrjm0M6YCvDU+p9XB1FYaFESnhadRuF0M+ X-Received: by 2002:a05:6122:20a7:b0:559:5ac3:4451 with SMTP id 71dfb90a1353d-5633955dc2bmr276579e0c.3.1767661090697; Mon, 05 Jan 2026 16:58:10 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 71dfb90a1353d-5633a3b1388sm87798e0c.3.2026.01.05.16.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 16:58:10 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.49.34.222]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 514953401CC; Mon, 5 Jan 2026 17:58:09 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 42DBCE44554; Mon, 5 Jan 2026 17:58:09 -0700 (MST) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe , Shuah Khan Cc: linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Stanley Zhang , Uday Shankar , "Martin K . Petersen" , Caleb Sander Mateos Subject: [PATCH v3 08/19] ublk: move offset check out of __ublk_check_and_get_req() Date: Mon, 5 Jan 2026 17:57:40 -0700 Message-ID: <20260106005752.3784925-9-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260106005752.3784925-1-csander@purestorage.com> References: <20260106005752.3784925-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" __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 Reviewed-by: Ming Lei --- 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 abb668b460a8..e44ab9981ef4 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -253,11 +253,11 @@ struct ublk_params_header { =20 static void ublk_io_release(void *priv); static void ublk_stop_dev_unlocked(struct ublk_device *ub); static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ub= q); static inline struct request *__ublk_check_and_get_req(struct ublk_device = *ub, - u16 q_id, u16 tag, struct ublk_io *io, size_t offset); + u16 q_id, u16 tag, struct ublk_io *io); static inline unsigned int ublk_req_build_flags(struct request *req); =20 static void ublk_partition_scan_work(struct work_struct *work) { struct ublk_device *ub =3D @@ -2283,11 +2283,11 @@ static int ublk_register_io_buf(struct io_uring_cmd= *cmd, int ret; =20 if (!ublk_dev_support_zero_copy(ub)) return -EINVAL; =20 - req =3D __ublk_check_and_get_req(ub, q_id, tag, io, 0); + req =3D __ublk_check_and_get_req(ub, q_id, tag, io); if (!req) return -EINVAL; =20 ret =3D io_buffer_register_bvec(cmd, req, ublk_io_release, index, issue_flags); @@ -2577,11 +2577,11 @@ static int ublk_ch_uring_cmd_local(struct io_uring_= cmd *cmd, __func__, cmd_op, tag, ret, io ? io->flags : 0); return ret; } =20 static inline struct request *__ublk_check_and_get_req(struct ublk_device = *ub, - u16 q_id, u16 tag, struct ublk_io *io, size_t offset) + u16 q_id, u16 tag, struct ublk_io *io) { struct request *req; =20 /* * can't use io->req in case of concurrent UBLK_IO_COMMIT_AND_FETCH_REQ, @@ -2598,13 +2598,10 @@ static inline struct request *__ublk_check_and_get_= req(struct ublk_device *ub, goto fail_put; =20 if (!ublk_rq_has_data(req)) goto fail_put; =20 - if (offset > blk_rq_bytes(req)) - goto fail_put; - return req; fail_put: ublk_put_req_ref(io, req); return NULL; } @@ -2682,14 +2679,19 @@ ublk_user_copy(struct kiocb *iocb, struct iov_iter = *iter, int dir) =20 if (tag >=3D ub->dev_info.queue_depth) return -EINVAL; =20 io =3D &ubq->ios[tag]; - req =3D __ublk_check_and_get_req(ub, q_id, tag, io, buf_off); + req =3D __ublk_check_and_get_req(ub, q_id, tag, io); if (!req) return -EINVAL; =20 + if (buf_off > blk_rq_bytes(req)) { + ret =3D -EINVAL; + goto out; + } + if (!ublk_check_ubuf_dir(req, dir)) { ret =3D -EACCES; goto out; } =20 --=20 2.45.2