From nobody Tue Aug 11 18:48:19 2026 X-Original-To: dev-commits-src-main@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 4hKLH82GLRz6p8kw for ; Tue, 11 Aug 2026 18:48:20 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hKLH81CfRz3lmK for ; Tue, 11 Aug 2026 18:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786474100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DocCj171LMMa6GCjh9K/WKhMhqUJIRoLzJOlFtDZYxE=; b=ki4Ns4G3B9dxSJRa+k6nGZn/e2J1QgXTQmFkgezSkTg0Vyj2KK2diin4W2OL7SaFmIMtUC PJbii6us7Qr5ztGnVgX0MztG8//33DtzJIgyIqws97Lf9KD4YtczmEj0kDY4DUK15Lmnrg dK2boQiyOVz4aQ1ayw0exFTwidNII7bVEc6AImdN6MFoQK276l9S5yqAy+0PEgeuFPEp4i jJWNDcqVKL1o2jLWcaFOu8/FAvNC7HSos3RgOGo1cxl3jIFtwmr0dQIN8B7DBG/6X5t9xl OEIoRiIOqB7BZkKDF+ngJJDlYiha670VG6bGHA6VgqZFt+S/q3FtKyNHH9x56Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786474100; a=rsa-sha256; cv=none; b=Nte/ccOkNJMucqMtXUqbZCgUlX7jPFn+V3C72HYK5UuF2A3c3kNO6ea303RmWHYXpyyB+9 3bFmJ4BXf5nQcsOQ2jgUOEVdokJpohZ7D0Ro+6lJ5gNzuDy1KztRZUXggrfnzO6J6Hqqn/ AtiJHM/00V0STGPuTzs/niW7rthjsW7Y+G6dh2ZOTbDrHFCrW/aJqkQc9s9wujDh3s+0sC kwk/GsX95QffUhPiRiCPiDJ/6qwP0+wXyNu4QJgzUSZc0GPYIH1UNyQAw041WVWdftbc5U WWX7RCva3rhfh+eMozcj86UkBO0m7I7nRM6EwsK2E1h7KF2Gaya5CuA7lWdVxw== 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=1786474100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DocCj171LMMa6GCjh9K/WKhMhqUJIRoLzJOlFtDZYxE=; b=NOKaE2e2KWDasbHPm1xfuz68+ggmskrdO1LRuOHuEBd5uUl1RolBWfSiLbUYh3OQNhgTf6 2VC4kgofy3U6QrB2bCEcwW3oNmcmWY246LRB7q7ssooZVB8zUGm7HhAl8x/0lmHtjAPuQM ar/YBJ/Fg5NsghF9N7cY3xH2uSfKQ5HLpEEYZuNdgZaqLHDSgCc92eW5r5q3ULtpWnfNRu 3QCUOIaSU9wEGv3apk1+oUFmKYHkueeB9N+dmUrm8DSnh4yhXqNPC5+/9tLeQ34Axl2OvD yz/iYcQAYACN5Uxn0w3HNsCadUGCU1jOONHYD0/AlvnIBFyD95xE9X8DQiAQVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hKLH76ZJ9z16C1 for ; Tue, 11 Aug 2026 18:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 11 Aug 2026 18:48:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Menachem Fogel From: Kevin Bowling Subject: git: 0fc30789dff0 - main - e1000: fix NVM loop bounds and pointer access List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fc30789dff08d62c5c830e9aa8c5a0ca9080ad9 Auto-Submitted: auto-generated Date: Tue, 11 Aug 2026 18:48:19 +0000 Message-Id: <6a7b6e73.20c32.7f4ba1cd@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0fc30789dff08d62c5c830e9aa8c5a0ca9080ad9 commit 0fc30789dff08d62c5c830e9aa8c5a0ca9080ad9 Author: Menachem Fogel AuthorDate: 2026-05-20 12:52:44 +0000 Commit: Kevin Bowling CommitDate: 2026-08-11 18:47:58 +0000 e1000: fix NVM loop bounds and pointer access DPDK commit message net/e1000/base: fix NVM loop bounds and pointer access Improve the NVM checksum routines by ensuring loop bounds are compared at the correct integer width. Use array indexing instead of explicit pointer arithmetic. Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Menachem Fogel Signed-off-by: Dima Ruinskiy Signed-off-by: Ciara Loftus Acked-by: Bruce Richardson Obtained from: DPDK (39fba42d04) MFC after: 2 weeks --- sys/dev/e1000/e1000_82575.c | 4 ++-- sys/dev/e1000/e1000_manage.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/e1000/e1000_82575.c b/sys/dev/e1000/e1000_82575.c index 47b8006314f8..d0aebbce74d8 100644 --- a/sys/dev/e1000/e1000_82575.c +++ b/sys/dev/e1000/e1000_82575.c @@ -2348,7 +2348,7 @@ s32 e1000_validate_nvm_checksum_with_offset(struct e1000_hw *hw, u16 offset) DEBUGFUNC("e1000_validate_nvm_checksum_with_offset"); - for (i = offset; i < ((NVM_CHECKSUM_REG + offset) + 1); i++) { + for (i = offset; i < (u16)((NVM_CHECKSUM_REG + offset) + 1); i++) { ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data); if (ret_val) { DEBUGOUT("NVM Read Error\n"); @@ -2385,7 +2385,7 @@ s32 e1000_update_nvm_checksum_with_offset(struct e1000_hw *hw, u16 offset) DEBUGFUNC("e1000_update_nvm_checksum_with_offset"); - for (i = offset; i < (NVM_CHECKSUM_REG + offset); i++) { + for (i = offset; i < (u16)(NVM_CHECKSUM_REG + offset); i++) { ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data); if (ret_val) { DEBUGOUT("NVM Read Error while updating checksum.\n"); diff --git a/sys/dev/e1000/e1000_manage.c b/sys/dev/e1000/e1000_manage.c index 96a7a3dde8a9..2cbf5af0af1a 100644 --- a/sys/dev/e1000/e1000_manage.c +++ b/sys/dev/e1000/e1000_manage.c @@ -159,7 +159,7 @@ bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw) len = E1000_MNG_DHCP_COOKIE_LENGTH >> 2; offset = E1000_MNG_DHCP_COOKIE_OFFSET >> 2; for (i = 0; i < len; i++) - *(buffer + i) = E1000_READ_REG_ARRAY_DWORD(hw, E1000_HOST_IF, + buffer[i] = E1000_READ_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i); hdr_csum = hdr->checksum; hdr->checksum = 0; @@ -203,7 +203,7 @@ s32 e1000_mng_write_cmd_header_generic(struct e1000_hw *hw, /* Write the relevant command block into the ram area. */ for (i = 0; i < length; i++) { E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, i, - *((u32 *) hdr + i)); + ((u32 *)hdr)[i]); E1000_WRITE_FLUSH(hw); }