From nobody Tue Nov 17 17:08: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 4jTWQG5ZVTz71STG for ; Tue, 17 Nov 2026 17:08: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 4jTWQG2fp8z4Mj1 for ; Tue, 17 Nov 2026 17:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935286; 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=YcVkOLxG6I46j3+DwtAyTCuAlG8O8W0/57dkRqRRSQM=; b=Dhk2kHrH+80lsfWujO0sjTnnj+tMRjrqGY78kpm5HpwSMSK8Lb5XFQQjRHZNftEWGeViFc GMEhcq8oPEN3YmqJkn+XbxnrYB5SCyT+98SVqubnkJIliDB8mTCmHIByK6SBFUQTN7va/8 G0fay/9vk+O00ZSpTpX9AKRe2EguYhgZax0GbMnt2+EGLy5QWtc/Rz6moZaBnL8ibumPNM Yso3pohYjrhDvnDImfP97c8h/QD7IvOxw0d8JVyzfyOp8njLUomkgdYffIoNjWu1JI/uBL iTPxD3QzFrcQCemntkBctub7U5F4P34t/XjIqei/yfElorWYrV8BwB2My0qhSQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935286; b=lIIgMv1PwKqTBU+egBE+biRsnZvsYPuBCPy0lXXq20wKP4qL0xAZRgzax/ddiqm/cRdJU7 f/rvNAIqDsBLJ3XeeUTwSQLFIxEpZ//6j7oQT9uR3lgEv08a1K9NNo1vT1t1WyvsUHDjoh tZ/jUzG0/UF1K8on4IhfX9zgo78v9Nd13hIXUigvoiYAW8dplsNqA40dcfN18wadZPVQhg B4+mn3zz8Zdj8aH++vt4CnpvR0+htdBpzsIRJeM9gRc6K2IopAapHu3cT/MuUYfmxwKqjX wtliaKX36M/KZEhrLoNF/wApkn8F+xYPi5PGIcXYxQ2EAUaU+NeqovZJ/VEEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935286; 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=YcVkOLxG6I46j3+DwtAyTCuAlG8O8W0/57dkRqRRSQM=; b=FmzV9+joBJJpZYhYEyifxe2Qn8th3yLNCID/uAZ/TJ5eDApbAnlHvhwGPF2+VQAKOnoaBj u2HLYpAnafprLnwyPoPMteDjLdYV8sUOZWKv3HFqHa0TDO0pT2hLV/tIrjl7E9IaWEJLtq GT9mt2Jeg7JDZfEOeCmZKMdRr6wC+S/Sft0jIgjqeef0PBxTMeVCBwR1O4FRaULvAuAz31 J03PQib3H8Q6vgx73gd6HVOf/Dq4j8jmJ0JGkDjULlmyX/HfuG5GDAHVTKuVQ1NJg1mnB1 kSVBoVO6pjBOILX2GgbfIWbMax+pj3V290/pbH1Lhv6Wbxu40KAKLqgmgfT+eg== 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 4jTWQG1yj4zrpx for ; Tue, 17 Nov 2026 17:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0e43807b1535 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 0e43807b1535d5a374de43c7db90689469271e6f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:06 +0000 Message-Id: <6afc89f6.1ffc3.1b9c8ab7@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0e43807b1535d5a374de43c7db90689469271e6f commit 0e43807b1535d5a374de43c7db90689469271e6f Author: Mark Johnston AuthorDate: 2026-10-27 16:47:19 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:21:08 +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 fab3594e208f7bcc20ce7ccfa9dddffb364db5a4) --- 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);