From nobody Tue Jun 23 16:28:15 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 4gl9V842H2z6hhLm for ; Tue, 23 Jun 2026 16:28:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V8039nz3MmL for ; Tue, 23 Jun 2026 16:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232096; 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=VQjHGvC7BNInrElmmmqgW8kwQ60Br6J237SSIGIYV4c=; b=U/YerhBxBukGSYvh4JXev7MYNjlJW68m9ncRL7CTUMTF4Cug0pv8zO2YWoqoUeSMiCJQF9 bvHexnLRNDPIEvPXDKp25mhhA3Ca5N/xvWT7EfyP+qmCbGkGW+ozoaC7NvhNMOjR5huaVo 21qnhhql4hojvtY9jUyZ8TRXsCy2P0RetiE14yOHduUD3rZVtoLGwa/mJbKUd4P8J6WSp0 lmIcYaNO0IhNUXArxsAFLZBqYRgPdAszvUJHjVPv7P7Bo95Vkoik61pcAJIEARbK+aJV/k 3tyjuyaAD3MgWs6CNcwulA8JTR9M/sAte9tiKoi94qHk6FLyDiUgwULezqj03A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232096; a=rsa-sha256; cv=none; b=svbgejq3/nsE5I0gdKP+tPXa6QxtggqlsJmme/Fb3QkhFtCBajkpSC66WVnV8Tc7xopTPL yVYu+s8R6vnA3I3T27dynksuv4NUzpzvHznaaQQet6B1tAwpUQ1WfTW5yvMREJG/zLFbPE HkwjxHpNQZiMKDDj5ptB2ZOHBzicOe3mWFqQG7xicJQtf2hiZ7muX26oIZ8Sk/DhkNTXAm /rxnW7SaRrz06knIz8hg6tZkzUEEe1CS5WoI7oTvP558xGNj9BLNyS9emLPyfiGhef/vfX B/QmltdixHb/irjP1tzMSYxncjPJa601ex7gpkesV0linAhSAD/MQBQ4gJQlvA== 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=1782232096; 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=VQjHGvC7BNInrElmmmqgW8kwQ60Br6J237SSIGIYV4c=; b=vknX7xHax5ESYU7gofODGDwtgjc8F13lHrZLvzQXINdF0ulMKg6zokYEqUpPDjQgTGE7dr P/KO8WysRkc//ydLG72tkqfaHKaA0fMH5Y4EkHFXo1XnC+IldnJSnO0iRgjYPyxmI4f55Q 3KlbEbw+hCxrCMYb1h6D5cA+mSeRAeugV7q8VP95sZaW3h1ppGM5XWvV2014H7iUjGU9/C 1XQyY7gGFSo/iIHh43SbKhLz/QD0syNdar6IWP0vVnwiXivlf5v0Zys8JaQimwRYPl6BJC XcfGY2WcNFTJpqMnpFFfqEDCNJS/y5GNxmLXQWHAKQRTyUIdI921OSrLdL4Kxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V75tSfzhrV for ; Tue, 23 Jun 2026 16:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24d72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a40ffc719d04 - stable/15 - ctl_ioctl_frontend: Reject out-of-range initiator IDs 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a40ffc719d0401260fdcaf1bd88dfab17eb52aa8 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:15 +0000 Message-Id: <6a3ab41f.24d72.4ce42f44@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a40ffc719d0401260fdcaf1bd88dfab17eb52aa8 commit a40ffc719d0401260fdcaf1bd88dfab17eb52aa8 Author: John Baldwin AuthorDate: 2026-05-02 16:43:29 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:06:11 +0000 ctl_ioctl_frontend: Reject out-of-range initiator IDs Various places in CTL assume that initiator IDs are not larger than CTL_MAX_INIT_PER_PORT. Other IDs such as lun IDs are validated in places such as ctl_scsiio_precheck, but initiator IDs submitted by userland were not previously validated. PR: 291059 Reported by: Hans Rosenfeld Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56628 (cherry picked from commit 6f8312bdff236ad64d1c15c239051359d8245a68) --- sys/cam/ctl/ctl_frontend_ioctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c index 3449154afb38..4b82552ec21f 100644 --- a/sys/cam/ctl/ctl_frontend_ioctl.c +++ b/sys/cam/ctl/ctl_frontend_ioctl.c @@ -588,7 +588,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { struct cfi_port *cfi; - union ctl_io *io; + union ctl_io *io, *user_io; void *pool_tmp, *sc_tmp; int retval = 0; @@ -606,6 +606,11 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, if ((cfi->port.status & CTL_PORT_STATUS_ONLINE) == 0) return (EPERM); + /* Reject out-of-range initiator IDs. */ + user_io = (void *)addr; + if (user_io->io_hdr.nexus.initid >= CTL_MAX_INIT_PER_PORT) + return (EINVAL); + io = ctl_alloc_io(cfi->port.ctl_pool_ref); /* @@ -614,7 +619,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, */ pool_tmp = io->io_hdr.pool; sc_tmp = CTL_SOFTC(io); - memcpy(io, (void *)addr, sizeof(*io)); + memcpy(io, user_io, sizeof(*io)); io->io_hdr.pool = pool_tmp; CTL_SOFTC(io) = sc_tmp; TAILQ_INIT(&io->io_hdr.blocked_queue); @@ -636,7 +641,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag, retval = cfi_submit_wait(io); if (retval == 0) - memcpy((void *)addr, io, sizeof(*io)); + memcpy(user_io, io, sizeof(*io)); ctl_free_io(io); return (retval);