From nobody Sat Jan 31 18:28:10 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 4f3LwW0LQ7z6Qg61 for ; Sat, 31 Jan 2026 18:28:11 +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 4f3LwV4xgTz42Sl for ; Sat, 31 Jan 2026 18:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769884090; 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=Ssa73BpUF6PgIqqPepAq3trhpoNLF3Xp7XMFbyKg/Yc=; b=ef0CA1KIHh5rZyI6PwAxJy+nZKidZqzU6E86xVkRrirk49J5aZS9+DhCxfnacR9SynO5Cy BkDq9yHC/c+/8lkt8XNanX3g4W7I4jvDcjTaI1i+f3Ol5WwUK7CNCXfxB207dzgQMCJC8B i9WL8re7lYF5iisExK014SnZ0UVlsCegJfrXWJFCmif80xLsAEQmpXZF+ljfHXRUlY+QYB 7BCutZUX0R74n8KUMRdDSTw+EW+NFuRHfwvXlNNUEwrsHe+Wbbm25yTPmam8LGrBHXUIN8 p1A7per2ibMS5JV2HQRyUo3XRjr2t21du/K7CQ3n6lyPhQ725cnmgI+LwJLnnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769884090; a=rsa-sha256; cv=none; b=TfpvC7KZnqz3CPV7ndFcV4QBv4RxwPEkffty+Wij3MeUpihNVZhxroG0BTB0/aiALDUz2C Ok0FxUjEWDYhz+369nJQU2ZdQgwOOsZrtGVQQNxqJ5csRBMNC+f3gheHBJdE0vK0jOTJBc EYuFMX5qMgbUWk9c95zPjgoRKSgrDhqKK3jJGHYucuaRyFLDvoER8R0Br9klxMbm+Qa8fR 6OITI51SwjRavm3kEXvB30zv/i6maSzGkd86g2sZ0iOzzQrWiRz8fcDJwqivo0XQHApWyu a+xcl+dgPXw7pGYNvCAX/z9XU8O/qd2qBur1YQgks2xYx6cH3I7Z8avcoFFhMQ== 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=1769884090; 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=Ssa73BpUF6PgIqqPepAq3trhpoNLF3Xp7XMFbyKg/Yc=; b=DMi7JKMi/BNeafSpd0RJsqyA4ikKzc2ZUXp9yNKnOC5uB8JtEedP48SKRJp4u4C3Rfnalx O9pcf2NmPxuNmVVtnOI3oD+HGhfonZZEjwYRVWDwwGAcyazeC7mISbCEAp7Ny1vWHLMp5B K+cVtJE/CDfj/drJRYP+HSn9CzsimEBJIvCDVuUx4rOg2ovlPVDXzhHndFtvhncZV2yj/Z cCEcZU7Zb8R7Ldz5dPTuifJ5wHLyyb3NLFR/VnscPYmVup7z+/MYjFre2Mm70s14nio50a Ln9lDE9XGqxBHYlV9sDpLslphro0BtHqRMh8Ol1/ie64Vdc755I3qlTLFvw75w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3LwV4VkMz15GW for ; Sat, 31 Jan 2026 18:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23d7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:28:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a1828b1226fe - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: a1828b1226fe8de1325a0e46ec5732268ba4525a Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:28:10 +0000 Message-Id: <697e49ba.23d7b.5a75ed32@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a1828b1226fe8de1325a0e46ec5732268ba4525a commit a1828b1226fe8de1325a0e46ec5732268ba4525a Author: Zhenlei Huang AuthorDate: 2025-12-29 14:20:12 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 18:25:08 +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) --- 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 9963f472c615..99110e5e2d8f 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2539,7 +2539,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; } @@ -2552,7 +2552,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); } @@ -2560,7 +2560,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]; if_t ifp = ha->ifp; u_int mcnt;