From nobody Sat Jan 31 18:44:18 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 4f3MH649C3z6Qj8c for ; Sat, 31 Jan 2026 18:44: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3MH62gHDz4HwD for ; Sat, 31 Jan 2026 18:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769885058; 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=I8ejYQ0rug6mF8Hk3qmgcsvCr4CGMATAk/sQHezXWwA=; b=Y2hvHiEopJnVnY9shMEfG6mIGtMp/eqi7KQbuieJTr4GLF1w9+ihddljgt3Dkr+hxdlJLF KQ1PkTpEAvzRF4Hb5cR9JPF20DiX8UyejdTEK9Blg9Y9HudNqVnl86Yqyl7o68sHhmRF9T seUISAhCHwUw6dxXnvJaBkKycp+rFBnWUNrSKvXltnzhCeYPzYgwjoKH1phGNYxssKm5tV W3y8SowNlC2YAPn5RBDVj8wtVK1xLUyfeewp+APYaKnhDI4oRWlcz0f1oCIWtOQsTllrBD t3oveCLkqr2tS9r65LCZxON8oTSUEeHlzTBV/pgxzuJXgPUIeHNvDJNUDkTNow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769885058; a=rsa-sha256; cv=none; b=kNNbfsindoKwXbQYXAESBgiWXLt3sBh78GOD12T/OI/aUTmi5SIstZKK7cFZSkg6Xmy6T2 oFbb2ZmwV9hb9/JjruIGkZlrCqvpck0nC78y6EwVWN5wUT3KqQ0Yab3ceQZNR4PyktvKOk TqZEhh16E87cOLZSn3CjEb/qQsZa7ekJ70/fbJ+Lf1bOlyPSz0nPCI/12K821spaC1iU8k 1iTiJh6ayzvqIcw9qKcvz0K1LxbGBuE8y2YVd+i9r9ol0orGTqIKDV8MNGvoCXhyIpmsRP hQX2yaDc1rqiRzOM1AFucSEGzHvAusWAwttomOhfiQXviODxmFw+1pk6nTLCFA== 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=1769885058; 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=I8ejYQ0rug6mF8Hk3qmgcsvCr4CGMATAk/sQHezXWwA=; b=RkpdXDeQztQ2BVWrkAaOfq0lOpvHXhoaol8xO4n863l1wgZX7N4nKCmlg7FwWOEtEZ8sCK mSMMFeFyjpKJu4o0pIl4bRTKRtlJOaeb+CqCOW5vogW7rITCo+osG8q4FDzrYmD/k+2lIn mQk9yWMg/cgE/ZzB0Y065Gz/4txfNT5aO7q8zqAGL58wt8Hw21hS7/h5PVQk3H+vzmO6BV Q7ftl63MM6DacR27KZSpcG7FDBQmHTw4sa6ZWNRU8ZezRwFh0Vyro2b++eGZjMHrjMaCxM oUxSOmMdgCyuIwojShTpAphkPqqX+X6Nq3BsyyUkO5hMt2XX89KglLrnlinTDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3MH62G9nz15wh for ; Sat, 31 Jan 2026 18:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2634f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:44:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 37de97853422 - stable/13 - qlnxe: Avoid out-of-bounds reading the multicast ethernet address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37de97853422a9e27c35fcc2365e7f561dc8d674 Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:44:18 +0000 Message-Id: <697e4d82.2634f.7ddeb381@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=37de97853422a9e27c35fcc2365e7f561dc8d674 commit 37de97853422a9e27c35fcc2365e7f561dc8d674 Author: Zhenlei Huang AuthorDate: 2025-12-29 14:20:12 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 18:42:41 +0000 qlnxe: Avoid out-of-bounds reading the multicast ethernet address The correct length of an ethernet address is ETHER_ADDR_LEN but not ETHER_HDR_LEN. MFC after: 1 week (cherry picked from commit 85f499be90c15a3de02d1c62ce03b99fab52f925) (cherry picked from commit 2b01cc15447251862f5e25332fcbf41516f22a3e) (cherry picked from commit a1828b1226fe8de1325a0e46ec5732268ba4525a) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 745bd44e5b7f..ba9731600b50 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2586,7 +2586,7 @@ qlnx_hw_set_multi(qlnx_host_t *ha, uint8_t *mta, uint32_t mcnt, break; } - mta += ETHER_HDR_LEN; + mta += ETHER_ADDR_LEN; } return; } @@ -2599,7 +2599,7 @@ qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) if (mcnt == QLNX_MAX_NUM_MULTICAST_ADDRS) return (0); - bcopy(LLADDR(sdl), &mta[mcnt * ETHER_HDR_LEN], ETHER_HDR_LEN); + bcopy(LLADDR(sdl), &mta[mcnt * ETHER_ADDR_LEN], ETHER_ADDR_LEN); return (1); } @@ -2607,7 +2607,7 @@ qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) static int qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) { - uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_HDR_LEN]; + uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_ADDR_LEN]; struct ifnet *ifp = ha->ifp; u_int mcnt;