From nobody Fri Dec 19 07:23:40 2025 Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) (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 B4DB5267B89 for ; Wed, 17 Dec 2025 05:35:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765949718; cv=none; b=sx1biZ6BCkOjb34uravbIqSx8MiM5VNxBzd7TseDooPg2GP4Jqv0eyvx4D1iZoRzxYXjw1MMCfgcIp504TwK8Psu9wKxNOZG7Jr/0ylN6EcEt/FwX1mzustxRGLrd7IIisgJSbDJmD5BAsY57h6arRT+2nCdsyj7e0a07o7h/Is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765949718; c=relaxed/simple; bh=9ogkOXR+Y8uacI3HACJU9UwIkpxDQMrtkJbS21SD2to=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r+QAS+w3D21eqHN8EMfUWqUE7xF83CwOaSS64WTSRKhAqB/uwfI1qWkXg8tELjtEFnwf3wZfGQN2YmDgK4Zftjjzlhqc/K5/uvGYZ8i1b1J71XEp5EYyROtPjrxdN+Bbw5pacNPb/E8SsHJCvO0sTO4kvmYB++44woQIVwhNKDU= 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=X9IKB0HT; arc=none smtp.client-ip=209.85.214.227 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="X9IKB0HT" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-2a0a8c2e822so8333505ad.1 for ; Tue, 16 Dec 2025 21:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1765949713; x=1766554513; 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=7u5SiWUWisiZXxTwmOVFVNPK/bGMmkGtOM56/HKpE6I=; b=X9IKB0HTSYwklfV72sIvrTmR4B2CqtOLnXtG8R2O5FpHPadljp1bm+uDHWkC6RSgwI 8rCnt/YXXTjQrI743mRN8KGSZnknG2aUJWqF09O3hUNci/168Rn46JV5h2IDvoF85nwa hIaZBu6xCJ0dtjFUd6DsjGQM5Hz4OZa/4YVFZ92Hw2QKXSjz4FTBUpqxJ1I9H3KYhDjP nqCTmcrhBSHQMpgrT0LyLBU8PFmX0SQAdHS4VJQtV55Hxy2VAFFZwGLb3xu6LOc6qjJ6 4AS0eNI7NqOL0S0+Jcx3zRUFlPLyUMed068vl2DRkP5gJaer1rOT9ZCaDwL570PvrjrD HZ/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765949713; x=1766554513; 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=7u5SiWUWisiZXxTwmOVFVNPK/bGMmkGtOM56/HKpE6I=; b=sGO9pAN34KFBBI+ynKqcuwyH2a1mEuqyIwMcarKhAicFOrbx+sh4osKMpjCHmSqw0k Vyj/S2VChyy5p6EH8UdYiGY56Qsy/B/zw2NWYtOHyyWsk5+41Fa27yUcJpoLBPji8v7P lOPjVwGx36ruuN/Nl0PKH50cuN/T2WksxfYY+AWlcbyT61Etqc5JjB0tH3kjkoV4vQCy ABeztmrEQLl2qolStXxOCaiwxvXiogTqnqeJ2XL85JajRbgj0YfMACFviV+wIjJsOKiF YB7Ro+8SR1c3fdN+E56GX3x3YDLCpirXcrluzTmkKakjQnIobHCaDhiH2bwdYAb8gQsY Z6hg== X-Forwarded-Encrypted: i=1; AJvYcCXAmwLzC2wbyhv5AKZm5HBcBOL4qCd+Mu5BbVZcNszvSlf2jpDpYm0yJAX11AFyCEtDKW+KHPnTOas3S0w=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1ZkIcTcx9ReSRRaK06BXbrBMEVEP0zDV3/0Z2vXVsML4nsJHk KksgAR4XpiJNjRzJhk91kC1GnA/AkPKnTguM1fcoQf/zZ6z7m8y4jIBJCY1roIAY/qxzwt5ScOw HMHqRnKQtNhE2cSPQ5zAhnLP6rC2tFBScQxIopibACNUwh0cMPLn9 X-Gm-Gg: AY/fxX7MKkkLWMWYfKONcw0gBRsNKn7XfoEnd5sHLBW8SdAwRWDaWRoYH+wpaTuLSVE /8ccglkTcKnk0eHd60JpsChxMTd6ZxTxXpogKgvBMZ14j3HyMrXyPxiq8bwQo3LcOyrSAVVk0Qv 9c1vK4V/mPm3Nm/LHOxUZ2LCpSubuHb2n2857Eoii59ECtIcUYiEWGoPZ8Jqm7/pHxI5KqoM/UO bQeWAavZ7VNTWBQ1AKtg5UllTLNIADlXFRms4e69boiW1qXMlip1lItLOWu8l5h3jnyHRB2N4ir DmBW96HlCoX3g6/Vg3i4OKxl3qKCweyO4OPWAXKBMuSzIYCuoyhdyV0zAN7znO+TqsQyMdXcVeK gDPtiKZf7lAxdRg2JvLp9rexRAxw= X-Google-Smtp-Source: AGHT+IEj41P1BUf7dMXgS7Hk43sGC2zUpFq8+vGee37eWRP/iFh7GVlQpIzMmAj5i5ENXIqxkVkgxN4N88rt X-Received: by 2002:a17:902:ef4c:b0:295:745a:800a with SMTP id d9443c01a7336-29f23afa321mr119245915ad.2.1765949713116; Tue, 16 Dec 2025 21:35:13 -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 d9443c01a7336-2a086eaceaesm18721215ad.5.2025.12.16.21.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Dec 2025 21:35:13 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id A24773420E8; Tue, 16 Dec 2025 22:35:12 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 9FF0EE41A08; Tue, 16 Dec 2025 22:35:12 -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 , Caleb Sander Mateos Subject: [PATCH 11/20] ublk: move offset check out of __ublk_check_and_get_req() Date: Tue, 16 Dec 2025 22:34:45 -0700 Message-ID: <20251217053455.281509-12-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20251217053455.281509-1-csander@purestorage.com> References: <20251217053455.281509-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 --- 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 273d580ddc46..7fa0a9f0bfae 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -252,11 +252,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 inline struct ublksrv_io_desc * ublk_get_iod(const struct ublk_queue *ubq, unsigned tag) { @@ -2245,11 +2245,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); @@ -2539,11 +2539,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, @@ -2560,13 +2560,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; } @@ -2644,14 +2641,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