From nobody Mon Apr 13 00:21:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fv7P00Z52z6ZBSB for ; Mon, 13 Apr 2026 00:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv7Nz4J08z3W0D for ; Mon, 13 Apr 2026 00:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776039667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P5I7TzvFReC+2Vh+bZeasb8h4DFBaUv7FnPz7bYLQ0=; b=VImVjg3aGHhwUZtgWDPWLvr5+bIXdud0mA5F9lRDNDlCp5ivdeUxHLCkDxbk7RDJEkzlGE 2xKuNgzwGdEaqiobNac6aIUrOk5CvNO/3xOI9Bw29e5Y3TwPL//f46heKlATk+emKc8tDd ikZjwzCZPvFa0voHfR+xR/l6Kzo4SljfTGiAyu1SmL9NNqgE+t5WaGmvcYTcyd4ce+ylKs I3TfsogfK3UVb/Z724vsPD+Yov0Rxy50kVcU0iyJUWV38G6Np7oDQQbIkN5BiAbOpXuQiZ E6k223om9Gtu6IWhebCKIRsFAyC0nAOdwJ2WvywVORcpODh5qcGxJQTWqit2/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776039667; a=rsa-sha256; cv=none; b=Fu/fVJbgiYxh1Mwq+/dc0tO31fxA+Ph1SSgPWCxwaf4kMCvtB+cuOKxxjhsi43is4MX014 lgqpMIZ1Ga75vNsQ8g96rFEg2IPOYQR1zsCIZDKc0Zoqoyx7r6X8yAEz7XNMUIkrPjpA9t a9t3QypGg/EiAO0bMWpKUJnuTuzuvIvhc+NnVNGL/FtP2kahBccmLWvrAzFDVsJM8jd9mC c62jECIfIjyH5LFutQ1ebW62G/iZaQ9FxbULoG8gwoAHtytj1DKZPfCeFeCGAhB/oq41w0 HIbV2FTrE8ZaTuKCfsl8VwHMybKYb2cJcH31+srh545YTVzixliDvmKHpXSbfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776039667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P5I7TzvFReC+2Vh+bZeasb8h4DFBaUv7FnPz7bYLQ0=; b=S/DBcNAQroSowJ3HRFzVPpinZufd+Frh+A5taawdvAPL5HRJdxifIw2Z+g/Qufx7i3XY+J k4bmnhlFhbMyVBM0o5bLUMTzxWl+MGvxBljdV4viCFNtx0Cpk7kbjDIFSbhpJ4X+TjduvW lUIOrdtho39KiOLsabkwzcjSk5xjQ0i8VM7W8VJ5hhZzu3BPX42w+Ek/n5K/1cWb7Ur35J JxLJeuUyHR9tWFQrhtpNqd9FrE233uTVa9csYN6e3tt+UARZp2QypbG23ULt/ZsmV2vWYb q9kD08AIUvz0zCAJpU4GouMbYhxkdUA4DgNUyVF6vaD/K8bdygLCRPMOJhS9aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv7Nz2hPBzgFf for ; Mon, 13 Apr 2026 00:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3653b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 00:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 8085c5a5c1e5 - main - nvme_ctrlr_linux_passthru_cmd: correct size of upages_small array List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8085c5a5c1e50eb478fb7b59fae201d9ab4207f0 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 00:21:02 +0000 Message-Id: <69dc36ee.3653b.3a0fbfd6@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=8085c5a5c1e50eb478fb7b59fae201d9ab4207f0 commit 8085c5a5c1e50eb478fb7b59fae201d9ab4207f0 Author: Ryan Libby AuthorDate: 2026-04-12 23:39:41 +0000 Commit: Ryan Libby CommitDate: 2026-04-12 23:39:41 +0000 nvme_ctrlr_linux_passthru_cmd: correct size of upages_small array The size broke when upages was converted from array to double pointer. Reported by: gcc -Wsizeof-pointer-div Reviewed by: imp Fixes: 82ff1c334b97 ("nvme: Allow larger user request sizes") Differential Revision: https://reviews.freebsd.org/D56368 --- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index e5094e909a24..447a824df8be 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1518,8 +1518,8 @@ nvme_ctrlr_linux_passthru_cmd(struct nvme_controller *ctrlr, } if (is_user) { ret = nvme_user_ioctl_req(npc->addr, npc->data_len, - npc->opcode & 0x1, &upages, nitems(upages), &npages, - &req, nvme_npc_done, npc); + npc->opcode & 0x1, &upages, nitems(upages_small), + &npages, &req, nvme_npc_done, npc); if (ret != 0) return (ret); } else