From nobody Tue Dec 16 04:42:23 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 4dVkmw1gk5z6JxgQ for ; Tue, 16 Dec 2025 04:42:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVkmv5sc5z3fVq for ; Tue, 16 Dec 2025 04:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765860143; 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=GHfbGUMbXaXDK70a2XynTjiS1AGtZlhhRczRk4K9lGw=; b=oHoekmIrsklykorjPyuY7/0ZbjLSy8B7QQztZsI9HekQjl9fSRjKGwPk55+vfyiyJaboti tSiwpr56KkNTQ6j2E5J8iGJ1nnsnStytVJ/qYDaN6P3yZQuhzO9YeWePBIFBeECdsBhf61 XGHNtoA4D5N2DEk2hcH+Wq/O8sj6ey5ifbNk4sZyYElkKpTrMmlz5v8Lx7nZUQoYXZM6an VPto7HDX6cAZY70gb//o1VDmQUbSWIGAdWSSiCA4FJ8/0wWKxTb/TZSHIOhZprMVD3MzgW ypxUGJZAZydADXbf2fS+7oM0/POytugh3wgYQimeP4+W+orCvahDYh8XjK1xaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765860143; 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=GHfbGUMbXaXDK70a2XynTjiS1AGtZlhhRczRk4K9lGw=; b=bJMDKkRDWfKNH0s++Xemg6a0QfxVUrFEjIde8Yk9LsYmFuLXtddF3FyP3V72+7Sq2Fev6+ 4ERrvIAJHODl/kOe2HCHrg8tiLRq5iB4kTqy9TehiR/hn3ieeIRMGKfVtgzIWAAxUXpnBr 62GhbrFWa7prRfiH6f/kjofWL8YhtZ+9xco/zzVU2hDvevq2Uj4Bbcox6HBQ/VPw5Ozkhy MM9kmZv/WAVbRSuDkL5Suw9Yz0VEJmP3YU/UVTlH6arZLT10/C2P+r6+GKkIkBFjjN+wKk jyASAurkmykz5LpOlNMXWAAfg5LxBrIv2vnbJx26Cv4KZ9zor5OIYBzG3rYfJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765860143; a=rsa-sha256; cv=none; b=GEOlB4bML8SghWVFGjZ9KVvX7reJMpG6ekESRlYYexakyOF9uNv4ER3Y7FZf9+npsCcfOD wcW4dBkEFWbo2cwHCbiVaUQIw1s052LayW6jh6VdL7Ypv8ZhsEOq5pxxbHuCzT8bE/qBIb c9Z/xxqYlNYb5blvSMzbm2YlaZhYmdmjCmmk8VLElRk+lbi4PIRbc0v/PKPyJNuTlVl5tm iqnb7zzLEvakRucjgdjdWN9RWuaPrwEIJaRqrVNNBEURYXW1pzAdAZBRYeL++17pVchET4 fFj+l6P4DGgmuBOLxjNFjLmYsr/eFCiYYD8WEUrLU7M0r21ENP28c8rRIIisJQ== 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 4dVkmv5RV5zryC for ; Tue, 16 Dec 2025 04:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ae91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 04:42:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 094626d3a500 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 094626d3a5009a56bf1b763dbdfc681ce371dc99 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 04:42:23 +0000 Message-Id: <6940e32f.ae91.28465719@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=094626d3a5009a56bf1b763dbdfc681ce371dc99 commit 094626d3a5009a56bf1b763dbdfc681ce371dc99 Author: Zhenlei Huang AuthorDate: 2025-12-16 04:41:02 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-16 04:41:02 +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 --- 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 7b6eeb460095..5da346e308ba 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -1230,7 +1230,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, @@ -1373,9 +1373,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); @@ -1579,7 +1577,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); @@ -1593,7 +1591,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);