From nobody Mon Dec 29 14:21:32 2025 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 4dfz190K9fz6Ls0Q for ; Mon, 29 Dec 2025 14:21:33 +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 4dfz1860K0z3qKK for ; Mon, 29 Dec 2025 14:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767018092; 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=4TAmlZqaXkNkLdaeMriXbuaKGQUaoZ/iYqRgSlYhaqs=; b=lSJT5AyQUk6LoMZ5g0JDl2/NSTIdiDEMFmD5uqSFmaALj9gwlfNB8LGtpN26etCtBWBOXx vPOtORfscf3o7D8ePrQW/ttceaPU9iQYnfvjJHI2EJM5z5XA4NuHWthn0GFB0NjiNUVyIb kYjNsQ6bKq28lgC9rcjebkBno7QUInQmT/3Me/8epQOJOjDiGl8zz01kiSiD4NWS94fMUC 6pJmyFFh+w/OA3NJWE+8dl1xsGJ2VT/tfX33vtM54HfWaLJGtUKEeU37t4kF6zOTEK10jN 0gEuO67//uW5zjgXBKNJhnr5np15leoV9ImlLqBY2E3452dwTmpR5dcXdGNVVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767018092; 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=4TAmlZqaXkNkLdaeMriXbuaKGQUaoZ/iYqRgSlYhaqs=; b=PJuKa3s8C8FEnI6pvivBovC5ipqRFnrCzWpNXmiHRAiXyTHcccJ1Rf0tpQ9AClR9H96+Ow d3PR06z3HqUI69BaX/g03yVPFqPA0E8UhdKap3zsOfZ1snMfHq0I9X37pCHt9/hvvsia+o rzhC6goOuvNpwAzVUMFxMjxUkeJnvsIeNWJVKi24hShFAzuD48SrXCyKpCswb4mXnb+IVw m7T82E6MXh1OV8zH5fa3ZqwZ/hicTvMV/1Ei3YlyYkBrQLg8/xhv2iwGMCogzRHIcZImhx rjLMr/fnkyLCzf5j6QDUaNaXlkuoitRV+bs19cE5IcvqW/Lve9mMLqt2rcTmzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767018092; a=rsa-sha256; cv=none; b=WboqRdUgRHcjhC1a99XMOQgCeeHlrsCHyLmYBI7PahUpP+RT7sv3IB5wlecbI3QArhbWmW a66H0/0TkHlQ+VpDz3s7za3XuVLdjXjW/FnvyzCWTHImX07cjHnHQ71UpGjt5ZVAYM7y2l bUlo4KT88AqsWQEGTwa+0L92oJ9B2yX4FuUbzdN558GwzFxi86eUpz7oLxEM8f3AfhEiHJ y4I0hbJsGxKnxxYHij1JI9QK8QuGMQkGkXSUSbryvLUiTsbK22R1fVWVLzozrSwd3TwzOb ZEXC9d1jl0ai6k/O3TKbrEk+j9Gox5NnfJ4DvGGRBZ/bfiVBmXDYKxfPJEA7Fw== 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 4dfz185YJ3z2TH for ; Mon, 29 Dec 2025 14:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d50c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 14:21:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 85f499be90c1 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 85f499be90c15a3de02d1c62ce03b99fab52f925 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 14:21:32 +0000 Message-Id: <69528e6c.3d50c.1d9cf8d5@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=85f499be90c15a3de02d1c62ce03b99fab52f925 commit 85f499be90c15a3de02d1c62ce03b99fab52f925 Author: Zhenlei Huang AuthorDate: 2025-12-29 14:20:12 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-29 14:20:12 +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 --- 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;