From nobody Sun Aug 30 04:07:26 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 4hXdr411GTz6q8VZ for ; Sun, 30 Aug 2026 04:07:32 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hXdr35zsgz3HCM for ; Sun, 30 Aug 2026 04:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788062851; 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=rexVoJCKSlLLpwwjmInI38cFkH69z3qkNY3Sp2DIGTQ=; b=M7NaXpj2Yr7kT0Y3hMfD96dVTQ1WFaMKU0HRo+TkwCkV2GrYtNee2N2IDCLBBZ9WQ5oSUu 35xdrmhOKfWMvR+wtK05+6rpCgbWQgFBQYldIhWz6dORfMJKpPcaXTDrIQcbpzEHr3Z+l3 WXzylv0EN5XwBg/eTmlTCdSFPw7oqqUK/wg+ULG2ZatJN4r+yOBLJiNmazgglGlzkqs9k8 bKgUshc6+Y3Z0df3JO1rvdmVorQKX5MSFqjPcwLZBNPuhbQmOvxjXcVFvE3JBVQwmHP8qC 6QrDAQIEd9bKkhmbXfrTaIMtyMI/KGgQsrk052EYt33UXOFKqe9fBu6/C2tzMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788062851; a=rsa-sha256; cv=none; b=lMYisXG6LyIklMheqOWT8v+zVvBNQKt49uW+rAQGCkvQnZnM8ShMgiYSOUmKvBaYLLJtRI 2Zpq4CJeMQdllMDikf2pehKhWDmufKlnuYAdRrX19Pj9N7QLBLHjMhuJtlCaRKGbB2zM+H a0zUZYVVsbFtJKIjG3D/nxUvkrlrlorQtIDo0Ms66jtInOVbZ5Ez4XHnZ1TH2aM/ilePec b5XEoxoNDeNukPPdzPK7ueqTwfksfB/WzAG1Qg4rV6bGaTIBPlAAuh/HXULvIQ6PdJogfl dK0NiVpJyTxZ1jxeo9VodUOdKvdooQsFyhXV+IjTFHWWVIsCtPenYMxoGhnELA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788062851; 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=rexVoJCKSlLLpwwjmInI38cFkH69z3qkNY3Sp2DIGTQ=; b=l4/mSS4JqSYi04XJu4WNkaVwX4lOz8iDnVPBFNVQa0ZKow+W5Y2EAiBm7b9s4mROyKWW4X //ydtlhwiIyiRLhqGLB7lBVdU0Ya1S9WJhlnCkP+zEOxxlHli9J6QSyGmBRotOa+4EOLHa rh6pkjAvhp6tO8efqaVU28y/+Jz1DFY4L7FoB3D/V9TruVIbOigWela/1gY6KMSGLMZ0a0 OGoA6WnR/kGu0nxgKzfIaxfl9M7sOatKEiTjrZXAx1ou05z/f1cVe1w0RmjUC6jPuzcrRK xVZZ/PxccOYADc6ESX1SD6FEQnj8cWCXSCRaI6PhN4MUaAjQuSU50Q9DkpoJ0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXdr34FZhz17L2 for ; Sun, 30 Aug 2026 04:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f30b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Aug 2026 04:07:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 32b99a26c37f - main - dpaa/fman: Pad the qman channel search array List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32b99a26c37ffcba4b1437f548cbbe7fcf1323dc Auto-Submitted: auto-generated Date: Sun, 30 Aug 2026 04:07:26 +0000 Message-Id: <6a93ac7e.1f30b.c2a9a66@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=32b99a26c37ffcba4b1437f548cbbe7fcf1323dc commit 32b99a26c37ffcba4b1437f548cbbe7fcf1323dc Author: Justin Hibbits AuthorDate: 2026-08-27 21:37:32 +0000 Commit: Justin Hibbits CommitDate: 2026-08-30 04:05:03 +0000 dpaa/fman: Pad the qman channel search array The loop goes over the qman channel total (16), so if a port ID is not found in the list it could walk off the end of the list and return garbage. Not a problem in practice, as only valid ports are included in our device trees, but protect it anyway. --- sys/dev/dpaa/fman.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/dpaa/fman.c b/sys/dev/dpaa/fman.c index 84350853949f..880f881a33bc 100644 --- a/sys/dev/dpaa/fman.c +++ b/sys/dev/dpaa/fman.c @@ -818,7 +818,7 @@ fman_qman_channel_id(device_t dev, int port) if (sc->sc_revision_major >= 6) { static const int qman_port_id[] = { 0x30, 0x31, 0x28, 0x29, 0x2a, 0x2b, - 0x2c, 0x2d, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 + 0x2c, 0x2d, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x07, 0x07 }; for (i = 0; i < sc->qman_chan_count; i++) { if (qman_port_id[i] == port) @@ -826,8 +826,8 @@ fman_qman_channel_id(device_t dev, int port) } } else { static const int qman_port_id[] = { - 0x31, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x01, - 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 + 0x30, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07 }; for (i = 0; i < sc->qman_chan_count; i++) { if (qman_port_id[i] == port)