From nobody Tue Nov 17 17:05:06 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 4jTWLp6wclz71RHh for ; Tue, 17 Nov 2026 17:05:06 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWLp528Wz4Gt7 for ; Tue, 17 Nov 2026 17:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935106; 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=DQZcFFVuQ8ZyfxgNUCjI3nhANcppXc0iAmj60EzVqfU=; b=FFdRnHXtFab76OO27YoKDtTjmTk48DLt4DK1Hw9mMQlA3fB/bnulPYEVagp2tEe1r6AEkL J6RDMhrGUarMyU0H1uPxW41aIAJ7HwXONTAXBQxSmALM9eQbhI4bljIFUbS2tb4Qs3e24m yGNMHmJRnMqSwqC6u9PQm1xmOs118Ozi7mJ85MbcEHEvDJtqu0ukNjXQtJd9JHBnYUQcf4 OjBXSkL//vsw0JnZ3jZCkmLKSj0wJw7P618cCwWvryHo/tTSvYKWxtmTNfBYk5saGT4cHd youFTi4y5n6nTGJ3h7O+1Ha4+UMkejqR/KeNjovQtfjRkVibgx/3WQew0lm9hg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935106; b=xeJsW0gFRW/H5z47POzfhb95twNiObDFhmWz3aT7KLVykjhH52LZtBc2RiiZNkvwPCS3mx +ThJJD7TWOT81paZa56iVLBC0ajx/vMLZdp87fM2uailvyqPvnx3rAONA+4nefNHPM6qNz Eu+9Sl8fV2HOdbQZG01jte9jO/FB0KNkh3pH8sEpxE0k5TPmSD4hJcxhcgEKwqk1z5m4EP jH28QGCFwuLT1hKQRT8s2pzl9F/brymsir8oBI95gPPyT6r0xbUGylTUmPz0A4EahSYuID /RvDDSxJdVSA0l28U20lhUSliVnnGM2FkQB6UiN3i15tPnP85Lp5pbRfr35T4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935106; 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=DQZcFFVuQ8ZyfxgNUCjI3nhANcppXc0iAmj60EzVqfU=; b=RaXcHzNH72cCC97HJ4Vlb70wzWcyZZ+ZxriT89b0OokY6conG5vqRm2gV2HE4RHn8oIQnz 4uWMtzIPb/epj3RU8gJZAu85dUmSJtljdxhShMfpwPUU259/s0ZOCDhKdKiiCdzrlsHEO8 +LzPcY2WrrY55QwW/EhwY2RG8dVmyPaEeMqQwJ0OwrdJr2/PzzMST1AXH1i5aS2OR9v6zV kenMQXXbWrevgUbvFfFYE/T4zusEa4JCJS3SMmtlyMNJXfppSnsODNWb+BIak+wOiUqA/3 Ch+3PXZ0xfKKWUXJFUvCVdh6N18sj3YK7+M3GYqAcfWvUD/pZflnIIQLUj0rHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWLp4gPHzr6y for ; Tue, 17 Nov 2026 17:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cee5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 10783f288172 - releng/14.5 - ocf_fc: Fix up max() usage List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 10783f2881726bfa05c1bb6dbbc795d2338b7b26 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:06 +0000 Message-Id: <6afc8942.1cee5.3c06b6be@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10783f2881726bfa05c1bb6dbbc795d2338b7b26 commit 10783f2881726bfa05c1bb6dbbc795d2338b7b26 Author: Mark Johnston AuthorDate: 2026-10-27 16:47:19 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:17:12 +0000 ocf_fc: Fix up max() usage max() truncates its parameters to 32-bit integers. Approved by: so Security: FreeBSD-SA-26:76.ocs_fc Reviewed by: ram Sponsored by: The FreeBSD Foundation Fixes: 26081296b244 ("ocs_fc: Harden ioctl, XRI lookup and FCP command validation") (cherry picked from commit 9b6b3a36ee295dc6edd0e00aa34adaebaed98c7d) (cherry picked from commit 5f5d5abc37d096264c1bb33feb8f9ea62c4f3000) --- sys/dev/ocs_fc/ocs_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 18dd3fbbac4c..9193f4168c5a 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -194,7 +194,7 @@ ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbox_t *mcmd, ocs_dma_t *dma) break; } } else { - uint64_t max_bytes = max(mcmd->in_bytes, mcmd->out_bytes); + uint64_t max_bytes = MAX(mcmd->in_bytes, mcmd->out_bytes); if (max_bytes > OCS_MAX_DMA_ALLOC) { device_printf(ocs->dev, "%s: non-embedded - %llu exceeds max\n", __func__, (unsigned long long)max_bytes);