From nobody Sat Jan 31 17:04:47 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 4f3K4J1nWHz6QWxZ for ; Sat, 31 Jan 2026 17:04:48 +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 4f3K4H6cCvz3TRX for ; Sat, 31 Jan 2026 17:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769879088; 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=vuLMEVnxb6sfGhwyytUcMtvQ40tcTOGN3ZOuoF+hfFI=; b=P8ACYII5W2rXBoDrIY9CuQehJtttcaUXV0AHIbuzlgS9atcxYp7KBPmQtFKsLL8N13RD7R 3kQ++pvAE3zg3bzjiuNiw1gNjqyX/BjmW41xA6l9q5nczAIB9DTv0svRRKKmB0JeFBlgvE xVUoFfQIyxc4zqVJJ74Yuet4w1xlvutcOmNOOqyvjNKciAvEeewvOQxl6YVCp5gpVkDAZc UWGstvSt03SkPZUUcfc9gMz2KCFew1ZRUUNCPtw3VU4zkr2ndg13Q2jJWRsJvMVcjghqBI c4v/E6YlIwHTejEP14nB+D9JeCTU2ytI3dUfSx04pE8nbBXK9okuwi4+njfUsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769879088; a=rsa-sha256; cv=none; b=oHuyB2Gou+sJHgDdWN5T+8UVSVAp4FBn99aNICHWh8ICDrXWN3azvhZIVNyfoUHU688QKh S4bDx0233QbEU8ffslGlyfaZZF/kAXUfrDH9tl7ZWXts57TMuowgELLcSVsxH2KgWuXQO3 loiOn2aVrgIVRZ1YzISOzi75qFGik3rdSSZAR6JfmCQKrHkaytg2lV1q7OdzM0Fqxp2ETI 6Xqg6iriQIbqgvSudJCrBBH8wE8vGA/s7QspR4Tf29p0O4YptUuIN+kG6S4QExMK4cOUde MbvE7LgnZ53s5EcLuF4qHIs0SeICDy5CW8Km+fNUD8d7ndm0/4IT3isLhUlDuQ== 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=1769879088; 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=vuLMEVnxb6sfGhwyytUcMtvQ40tcTOGN3ZOuoF+hfFI=; b=UhBvyNy+WY2KU0eM36ZdS7kLsXIsWv1kz+TtCm1lOga6u4sJO9UaucxHJKErQgMOeFrncR C989QXvbsvbmBH2GdCWDXlTEwr+dRE7SaRBV3JHt9QSyiAbbumYRHkDXwvhEeb2gAZuFPw MWyOI6Af3WVeW1DbobeOEcsaELwNBZeMV+dmSbtuzTOhYIx92kPlr1BQ7bwqeYQEkqyPLx Vko5h8/vwFT8WVu9WCfgTd+tuknQcL7ojBsNxk/Yz6YaXoYL/lSce9JYTRW83DKkIVGj6x sXXtzfRPBw32LRMyelDvPS4lTn+bFFJa8lqAK8lLmD+n3zv9b5tjWYv5KZmYrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3K4H5zylz13KY for ; Sat, 31 Jan 2026 17:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a38c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 17:04:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c162d7febbc8 - stable/15 - lio: Avoid out-of-bounds read or write MAC 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: c162d7febbc83c1d877876b18ee864213dceca51 Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 17:04:47 +0000 Message-Id: <697e362f.1a38c.5ac52ad8@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c162d7febbc83c1d877876b18ee864213dceca51 commit c162d7febbc83c1d877876b18ee864213dceca51 Author: Zhenlei Huang AuthorDate: 2025-12-16 04:41:02 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 17:01:10 +0000 lio: Avoid out-of-bounds read or write MAC address While here, replace loop copying the MAC address with memcpy() for better readability. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54177 (cherry picked from commit 094626d3a5009a56bf1b763dbdfc681ce371dc99) --- sys/dev/liquidio/lio_ioctl.c | 4 ++-- sys/dev/liquidio/lio_main.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/liquidio/lio_ioctl.c b/sys/dev/liquidio/lio_ioctl.c index b2fd54f59580..36e7710cccb9 100644 --- a/sys/dev/liquidio/lio_ioctl.c +++ b/sys/dev/liquidio/lio_ioctl.c @@ -443,7 +443,7 @@ lio_set_mac(if_t ifp, uint8_t *p) nctrl.udd[0] = 0; /* The MAC Address is presented in network byte order. */ - memcpy((uint8_t *)&nctrl.udd[0] + 2, p, ETHER_HDR_LEN); + memcpy((uint8_t *)&nctrl.udd[0] + 2, p, ETHER_ADDR_LEN); ret = lio_send_ctrl_pkt(lio->oct_dev, &nctrl); if (ret < 0) { @@ -451,7 +451,7 @@ lio_set_mac(if_t ifp, uint8_t *p) return (ENOMEM); } - memcpy(((uint8_t *)&lio->linfo.hw_addr) + 2, p, ETHER_HDR_LEN); + memcpy(((uint8_t *)&lio->linfo.hw_addr) + 2, p, ETHER_ADDR_LEN); return (0); } diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index 3c73a6b10eed..911ea6ba2159 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -1232,7 +1232,7 @@ lio_setup_nic_devices(struct octeon_device *octeon_dev) unsigned int gmx_port_id; uint32_t ctx_size, data_size; uint32_t ifidx_or_pfnum, resp_size; - uint8_t mac[ETHER_HDR_LEN], i, j; + uint8_t mac[ETHER_ADDR_LEN], i, j; /* This is to handle link status changes */ lio_register_dispatch_fn(octeon_dev, LIO_OPCODE_NIC, @@ -1375,9 +1375,7 @@ lio_setup_nic_devices(struct octeon_device *octeon_dev) lio_init_ifnet(lio); /* 64-bit swap required on LE machines */ lio_swap_8B_data(&lio->linfo.hw_addr, 1); - for (j = 0; j < 6; j++) - mac[j] = *((uint8_t *)( - ((uint8_t *)&lio->linfo.hw_addr) + 2 + j)); + memcpy(mac, (uint8_t *)&lio->linfo.hw_addr + 2, ETHER_ADDR_LEN); ether_ifattach(ifp, mac); @@ -1584,7 +1582,7 @@ lio_open(void *arg) struct lio *lio = arg; if_t ifp = lio->ifp; struct octeon_device *oct = lio->oct_dev; - uint8_t *mac_new, mac_old[ETHER_HDR_LEN]; + uint8_t *mac_new, mac_old[ETHER_ADDR_LEN]; int ret = 0; lio_ifstate_set(lio, LIO_IFSTATE_RUNNING); @@ -1598,7 +1596,7 @@ lio_open(void *arg) lio_send_rx_ctrl_cmd(lio, 1); mac_new = if_getlladdr(ifp); - memcpy(mac_old, ((uint8_t *)&lio->linfo.hw_addr) + 2, ETHER_HDR_LEN); + memcpy(mac_old, ((uint8_t *)&lio->linfo.hw_addr) + 2, ETHER_ADDR_LEN); if (lio_is_mac_changed(mac_new, mac_old)) { ret = lio_set_mac(ifp, mac_new);