From nobody Tue Nov 03 09:00:17 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 4jJjFt0NNhz6yPK1 for ; Tue, 03 Nov 2026 09:00:18 +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 4jJjFs31Ppz4J0h for ; Tue, 03 Nov 2026 09:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696417; 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=IlFneC4BjfgGLLwCygUEi9rV+y9MLTM7xXc/76I1WGE=; b=Kz+/LCfrY6Pw9aSjpI6LoWiArrdIS7688KUAjQYGngaXgTPZue3OEfkaa4V6WctTm+4Uhk nB0V0RP1tjOLTtD1ooE4dyatXcGAIGODHrHmtlH6CTNUighQsEQoulH9qpOTzI0BmDaoqY MdarJvcBR/WIj0skT7GPaZUUOKcedAkKo06ZlajcwFKkIwJerFAMiiK8ypCvGoo782oLUG T+vThhXhazFuACNxB7PdmfQGfJU53p7eGQxsu0m4/7enw6lfLdqEsDbejaM+Bc1uHf9aEh z7TXgqfADfuX3ZGLKemRqWnZ7oEWx9FbyVJ14ohwcMC92I9k9lpCNgcgjwO6Ag== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696417; b=rxOWauFgBfCwrc8eyHpqUG+M5pCHd5VsPHtfFGMYlp4gNb1Krr6yj1VpqHp+HY+k/D6peM CPBMwZIFd2qs9lWcpwtXZpABvVnDmYl15QzNgFNc7LWSnO29t4lCPQseLeQND/euOvZjQy jt/qmdUL6fidqOic39acBbUEwN5zu3oTIqqax5XPg+8YZhVE2wfmE6rwBEYSm9omBhsY0y N2Ul+goAx80rUUZ5nj4wF39xSh2U11dV1VBHi4WH1rU5S170uKdvPtzzveKQGy0s484CtH Yuw0YOzkNcpMaMNjUXkESTADp5kZjiO7B7V+e5vYaAKYH6HHCHf3vajt8cmSYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696417; 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=IlFneC4BjfgGLLwCygUEi9rV+y9MLTM7xXc/76I1WGE=; b=g0/8kwNO+b3d8ncxpw3eWvM2Jvbm8hnWvckXs3eXfjeXfXY1pPqsxdnHwJ5C6tmHE62QYk frTEHHcJ/A/WOcqc9jBReiYyt1XnElLiqp1FWbim+xunTTuHhTqMJPhJqIf/7rv7mpylQ4 kYma9wA7zRXFrJT9JPGASywh5uAkYYz6gKFrKw2gRpUD8gRbamCHnd63KKr1M/ruhCzTqr Nbt/Kr0p9N0c8Pb+16QR9QncOiGqUMGZ8NqyPH/XRM0BFOI37Umo7QNvMROmxpDgqn/erN nQFwscjHGpViXJq/I3Ysfln9JI1kXkErOF7CT32vOutds5FvPGuyrgez2wc2fA== 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 4jJjFs28hLz1Mkw for ; Tue, 03 Nov 2026 09:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:00:17 +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: 5f5d5abc37d0 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5f5d5abc37d096264c1bb33feb8f9ea62c4f3000 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:00:17 +0000 Message-Id: <6ae9a2a1.44a81.4f2bd83a@gitrepo.freebsd.org> The branch stable/14 has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=5f5d5abc37d096264c1bb33feb8f9ea62c4f3000 commit 5f5d5abc37d096264c1bb33feb8f9ea62c4f3000 Author: Mark Johnston AuthorDate: 2026-10-27 16:47:19 +0000 Commit: Ram Kishore Vegesna CommitDate: 2026-11-03 08:58:57 +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);