From nobody Tue Nov 03 08:56:14 2026 X-Original-To: dev-commits-src-branches@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 4jJj9C1Kcmz6yP9d for ; Tue, 03 Nov 2026 08:56:15 +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 4jJj9B6RsHz4HB9 for ; Tue, 03 Nov 2026 08:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpKYmMIVrAati4IChclRvlY6qI9s4ARHtPZyTG8R2+k=; b=A23lzVj4Coa1AbhSRjp2U8SXaKOYqOcmYFgif9r0vv9sYweP3ExeVIuqJahoidC9djWlv5 qEMcwQ3OHC3I/ke43k9tUsD08sbEJ/C59mx2LiO/nvBxFjCzr9zEfIM/JZeKIOBa+EZKWI YtTkd8/HVTRV4X57du1Yz/VhPhWmbdt3sfEzUhVxxo9gBF6JGqjby+8clFP/6MyVcKFPz5 TIIQVf2rSR1k7AG/kfvHis6aw0VH7p088D0Fe8ae/ZNWWE7Xku4c9+z+vILbuClxsRLo1J 5/d1caFqWAqp2P5T34HSC5yjoBkWNi0FgX5iIzepImkI0zi+lcrQqU3a2Tl0VQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696174; b=RzRq9Mkp6V2+hkBRYXv/4CU1VZ6DPutCpTpm17slqqPp2yghqNE6gUK88Wb/5U2uLTRvJy 7u4BOkIFZQyVgTtOGOc03r8AZbvRcD7K5uoKttkbyLsFWgvM8jPgr24kXUiYCPBW+FRXi8 YzoYTFcbViu9mF4ETxP4rvgUh+UWuUCYlCyRh43rpRyyqt3qGtBEKmudNoNZ1Y6ZXNY/vH k/vxo4v0gjD0nMtFJDPgD+p/lxrpO8QR1cOQJV5NWyCirKx6UvgrH0rlXCB+II/a4hDAlU DmF2WT7BFtoPJ5KO1XFx6548b55yYvggN40dN7D8AVerYRw1UiGp6bxkVXz0gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpKYmMIVrAati4IChclRvlY6qI9s4ARHtPZyTG8R2+k=; b=s/J0JXZ5TRxGB2OE70k6VeX8lK38qzrYVMmTvMSQ8XEzE4qNlqvorKG4rSI9LcqmkDJ6Br 7FSq1as58+o7EkKw+slT2k5uiAXcwDXPuO5dreUpoOMh1Z2Yg2RYSAdPaItoTLI3QIe1/B xeXHzxn/bIhRgUEv/VF1vYfSOnxuN53bHGdHE8rq3QriKlt93lGHrkjKdzJxBCZkje+nY1 PXdZTVMz/wNILJdFAoCgGZiou/TssSvI1jQeMuNzNuoo+tMEYZz+yCkBHDnV7CBQR6iZSB xCqh4eUvQdFMyJFxY1XU0brc5jRWqKepmevenOnfkOrNsvY9Ost4YJZKBRtZzg== 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 4jJj9B66M8z1P1M for ; Tue, 03 Nov 2026 08:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44549 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 08:56:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Ram Kishore Vegesna Subject: git: fab3594e208f - stable/15 - ocf_fc: Fix up max() usage List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: ram X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fab3594e208f7bcc20ce7ccfa9dddffb364db5a4 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 08:56:14 +0000 Message-Id: <6ae9a1ae.44549.211d3a96@gitrepo.freebsd.org> The branch stable/15 has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=fab3594e208f7bcc20ce7ccfa9dddffb364db5a4 commit fab3594e208f7bcc20ce7ccfa9dddffb364db5a4 Author: Mark Johnston AuthorDate: 2026-10-27 16:47:19 +0000 Commit: Ram Kishore Vegesna CommitDate: 2026-11-03 08:50:42 +0000 ocf_fc: Fix up max() usage max() truncates its parameters to 32-bit integers. 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) --- 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);