From nobody Sat Jan 31 18:44:17 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 4f3MH54Pjsz6QjFV for ; Sat, 31 Jan 2026 18:44:17 +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 4f3MH528Yhz4J1y for ; Sat, 31 Jan 2026 18:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769885057; 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=NNlW9UmNsudTe4YqHgsfwtdkugH7bmz992iiSLv+T0s=; b=c2b6SS25+ev9HuYzKhtsizJmqI96RT1HgdM4g8M5ydpt8bviTznSd0/0/p1NdV+t/SvL2P zOhIRLOpxcJ63tqtF60WhMliEE3Hxt5XcOUgJn89arGv19apikKh5Yp++mZ+BE0juMpa9O ZUfmxAFtDHHSuj7eFbkFhx61ps/TALYlbqbWqa+wMVz81MRHu0k7AzApBFx24ENJkJyLcI OgtN6wol++N6nEQsGzl+OxD/gFskY5fTolPmwTQEDWvAKX0eQwxjxZqQWxKaBbMrVYuwIr FhMPgeULO//8nR0fJeSjkQOngYBb3F8JWv0S2MDrTmzPEh1FIJTWfDxpXTXj8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769885057; a=rsa-sha256; cv=none; b=I7YF7XiACfcgAB/4Ed8KLT/ekv4ogNsIvBMfClUsWwBhpj4I1/pTPws5ubAILE9Lcjh18q /YYSJaYb0ZiQFQYsBVu5uiLHYKaiwpb+OKTNH7emrqOchAHALOfbTY4NZbKcMnIiKOBqqJ 40uH7TqnXq6/c64sIDtSeWRDkM61DMzakhE73DyhEU61J4PkNYbfUnbNx/idGYJFl2JdnK bgK9wuD7tMR4OtMdW83BIZVgi+RgWiT5kCabCwiThkj/8XH3d5/M717oMzUCf1FSRZwf3Z pWgMKi1DFTmvXu94gBAlr2TlOLWsCyrQjJOSbxl9Yt2KBQMfVi2T7fH95qAK0g== 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=1769885057; 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=NNlW9UmNsudTe4YqHgsfwtdkugH7bmz992iiSLv+T0s=; b=GiJyTjHQ82VkP/Lf1WNhmDjGMAncFUYxRct83QR6GlYYLluW023yvukrsAJUsPxJslFdyd 4t4GoCcAXCf5FuR/89ahKPfj0drl9pcAALJNTzm+pkXfsjc5foS9VQYO5+kE+z3iV1KrIU f82MM0mZ9Uh4HkO2Sa76kgwGkH7gKrvJXFcOcKR4g0S6frbWZcmgxT+sISJKYX0SXt1wCi Yl9A5PoSd/V/ZHMTzOLiXRdEL4503OyqFkffuMWp09BbcUeySgJcfcNJ+/9fg1wPcgVQ7L HkQL+fsKptM8sKelszYaY5n0kI137GttpK4DRFu7DO3vjSdsW/hbutrVhFndeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3MH51PT3z15fm for ; Sat, 31 Jan 2026 18:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 253ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:44:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f119719571b8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f119719571b84e00efe05c1c3bce7b9ada9fd776 Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:44:17 +0000 Message-Id: <697e4d81.253ae.755c3356@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f119719571b84e00efe05c1c3bce7b9ada9fd776 commit f119719571b84e00efe05c1c3bce7b9ada9fd776 Author: Zhenlei Huang AuthorDate: 2025-12-16 04:41:02 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 18:42:41 +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) (cherry picked from commit c162d7febbc83c1d877876b18ee864213dceca51) (cherry picked from commit e8de565f6bb8d91e2882ae5422b8a4a0337e4ca4) --- 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 449bc0219798..8d918e4f54be 100644 --- a/sys/dev/liquidio/lio_ioctl.c +++ b/sys/dev/liquidio/lio_ioctl.c @@ -443,7 +443,7 @@ lio_set_mac(struct ifnet *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(struct ifnet *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 92a3a4fb3776..b57c18e94302 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -1236,7 +1236,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, @@ -1379,9 +1379,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); @@ -1588,7 +1586,7 @@ lio_open(void *arg) struct lio *lio = arg; struct ifnet *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); @@ -1602,7 +1600,7 @@ lio_open(void *arg) lio_send_rx_ctrl_cmd(lio, 1); mac_new = IF_LLADDR(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);