From nobody Sat Jan 31 17:04:50 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 4f3K4L3HK7z6QWWf for ; Sat, 31 Jan 2026 17:04:50 +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 4f3K4L10Pnz3TbD for ; Sat, 31 Jan 2026 17:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769879090; 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=wmYv6UYWDS/MeCs738+L/Gi6bUbB9jFred09WXwfOS4=; b=Kif1RI350NJ1o54Rbih70+nZXVcdkX1zqSCyaruzXvJyiKawR/vJxSuBl3d9C/BTuKfxqU LyYHjMfdyrJmXiF3K1v1JbBzAdcpbj/AwBKImBzUgGmd+B/h0WOk6Z/EtRGyu/1z6TQ0rd ou2+DPQq0DOKG+cPWUPjfKB0j/ZNLgDTckUrCdl+jg6lzN9nFqksCgDr93Qr8Q1qiBq6EP BuGr2fPtj2c+F1kR0xazU5nQg4WzJ0wWqdE5GjGoVGWtHl/B/s/vhvhmc+AKnPEBpzi7AR YRZ8iL+wDp5wnq9ThC139ujKkEyrnA0l0MipY/1dGm8w4I1Z/eByDMjDBkgXdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769879090; a=rsa-sha256; cv=none; b=KsBWkByHA5YmFTzLVx53PCbqXNEIhuEnHX+wo8jkoQkw1Hf3Jd4RhPUOrUDS4KZiC0yX1c vaRuqtWMFFPWlNQss6iY4EzP4EObqyU1cpnk8r8lGiAAQ7KHHDGk3BWNZVqOL+cOv9GOGf S5+KYBLkPEAJ3ntwD4J1wAIIUFEB8T+xV+jnWJub5XvF6mFTHJ1NRK6u2pfxP4Zn+a4ykn 95FpEPTKrFI5ToF7TFF3kzya039bx+hrY5HWpzLttixRvFFNCiWpcO3MZ5eIbNLBCLEsHj pVMCiQx8OP6YOajrf1FpQdX5TFbEf76L0aBkKaEb5iChYSD1pmimnWrP+NfSbg== 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=1769879090; 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=wmYv6UYWDS/MeCs738+L/Gi6bUbB9jFred09WXwfOS4=; b=CITaiUknfVECxgYHBXcDGgBMzvvh9updxiUDzcwsHhDm1w7qw3h8lespHSmlFbOaJ6VUFl ygwPZH2euqhCsJ4PBT3njJMNBqRmDsTforioPTccl3bziAxP06xci7PecwT7FaQXpnrXj8 15UoUX3EhEiFMP9dHrs2T1dWuQ976VOB4N4xtoWvTa6wRjqJ8epoFaaBVzJ3lKysNCQCUi m/ZBS94yxzMBTeEQPo8l6UbLTQcZN+Oaek+ME/wzF0kIDTCXxTpI6L9ZYHRAb4y3xVN35X VCtmAdVFurGmQ5hTZYIKkow0AOpIVk7udL7agD6eUivt01nAfP1uOUCQX3YbNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3K4L0VH9z13Q9 for ; Sat, 31 Jan 2026 17:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 186cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 17:04:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2b01cc154472 - stable/15 - qlnxe: Avoid out-of-bounds reading the multicast ethernet address 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 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/15 X-Git-Reftype: branch X-Git-Commit: 2b01cc15447251862f5e25332fcbf41516f22a3e Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 17:04:50 +0000 Message-Id: <697e3632.186cc.76ca9ab4@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2b01cc15447251862f5e25332fcbf41516f22a3e commit 2b01cc15447251862f5e25332fcbf41516f22a3e Author: Zhenlei Huang AuthorDate: 2025-12-29 14:20:12 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 17:01:11 +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) --- 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;