From nobody Wed Oct 28 13:07:21 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 4jF71k3B2Vz6xRsW for ; Wed, 28 Oct 2026 13:07:22 +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 4jF71j4wrWz4Jvk for ; Wed, 28 Oct 2026 13:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793192841; 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=KclcUxiwOiN0QKoC4bPvUjuIu0NfaKn1xBYa0k486DY=; b=CkIPKYG1m76o2vKGjXjJsO77VvgdHHBIfE7MyIK0U8bWS/VwWweeezOhe7C9O0P2mnElpB 6ry6wy6xhRo8dSkPsA7AbROB4qI8uCgkNGtpobUj7kyUtGWr10Q5Ks5s10A8QawKvkTrFg j3F2yq0Vuxf28zMU3J9oOPFaCzop6HIjjimWW895eeVnW4AAkWduQ2TeCJ8g61rIlL1DgN AwDNrLD1/4G3CY0oJ9lJQ3jTJF/mgZaLxC8uaS0RKI1n2nRZMHUxHQV+a0dxH8mkwoqYVr Br0hwmSNZhQsMTBF9P4epGf//uE9pkE+Gh7B7shGglnycA88XFt3Z4gH54qjcg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793192841; b=DBGS3qP/VJYF4hLeey+YGH2rE/gF6nhwiNA4wm13BL/GbftIQqzU+ZRo2Z9VYwA0/NgYcU y+xwmKT6xIbIdcONh3P17o7DIgAgS/PFQD7/CbLpds81HEzOC/oZqouvR501dyM/IqEG3F 47m/Av06Izqt2bZhrMZqHu18yUuxeZMtYeH8ey4B9yJwxk6OFuOJACWBSHhgig2RHd8jHc aHfWtFednURcSZ9EQMvb/QUMpvY68v/ZQp5jfG4HS5yvJvB/beXhAmyI5BaF6xRA9OtbLb Foyk4Y3Sw3qpN2k6UMrz5ypqNgaqgdyReT6TB16/V//TSvd2EnfWhGB3GJSFag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793192841; 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=KclcUxiwOiN0QKoC4bPvUjuIu0NfaKn1xBYa0k486DY=; b=B/K59jriNMwFwNKC1cCju52LmI1IavniyvYB+htnkxSroz+YLA7HzSA3ZHSvJFqAGyUEdA jNgwJtIL7H1HHZOez8aarESVZoeQZoIdPblD372oJhMQf1FxLmeT0p0Kz1xpxF11wjGSM2 zPwESXvFURUlFUm8IEdvocvsuMAQpc1HQuSwwNNBq+zob+H6sJbGESb0/FTy9xThGHwEnp Q6n4rtWVIP2rkEjiFUMETre3lt3v6OsBAKZn6LjXwFXUiFiqxLHZru14Z5HLcTd/1EpD8g C/aDwjfvbWHBIatCaJzC6jpySz5PWRyAojCWFdwt60HwFKe6pcDWuRGSbZAqKw== 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 4jF71j48hRz17mZ for ; Wed, 28 Oct 2026 13:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aece by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 13:07:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9b6b3a36ee29 - main - 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 Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 9b6b3a36ee295dc6edd0e00aa34adaebaed98c7d Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 13:07:21 +0000 Message-Id: <6ae1f389.3aece.42eeae4c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b6b3a36ee295dc6edd0e00aa34adaebaed98c7d commit 9b6b3a36ee295dc6edd0e00aa34adaebaed98c7d Author: Mark Johnston AuthorDate: 2026-10-27 16:47:19 +0000 Commit: Mark Johnston CommitDate: 2026-10-28 13:06:58 +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") --- 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);