From nobody Mon Aug 10 16:33:23 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 4hJgKv5nHXz6p2Km for ; Mon, 10 Aug 2026 16:33:23 +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 4hJgKv1t3Kz3xJs for ; Mon, 10 Aug 2026 16:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786379603; 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=QtP4DsvX83W1hEtbOBw5yiA2uCyqYV5xH7BIK/G5kng=; b=T3S/1zgfzWB6ZDI+teYp426yWxbN+dmR71Rkxza2JcLxPSJ/ytjjoLyT0XZTR4BUB6pWo8 pXJPflCcSlvgyxPSj7zHUHiBcfNrA0lkoyIYNgK3HCEOzzuP7A2ztXUH85mYt/HbaVBYDe VaTOrxHgB5i2iJTTnusnGRK5KeNbgWdFCIUZfK7fT5IFzDp0f6YX90cAT8GG4mmS60CNLm ea86LgD/UeGuHq03UQQj1fRUYfRyTvjincqpjETSSj8Rf7DjCbUlBQOw7+ke64ONCt9y5i LiaKVRjWLzKcasNQJR2fO2KhY5g99LxgNPI5x4C3CX/V7d94OflhX3xb47d+Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786379603; a=rsa-sha256; cv=none; b=oig0zaj4A+SAwAjr7ZozmK0e1uqkZicO4XC1eRCzNC9c+XGiHDykUkwqXaL3MJkACLW+Hh D6G5GXBewtCoxjF0SNdBEeZBAL4jtXkY/W21f9veGyGfGJQDzaRDsLuK3ag9H6k2EvC4rj 9vujBfHSGv8KZ6Lo4VQWPNZtlc0g7KOnKjOjpw7hiG+Xssk0jnkf3Gy/j/X0gaVgSQ6DUd uRgUzb2Gtjjp/zl4vkcB8Wrbgcbh4ZoBivxDOM9dYXgWJYS1s0m4jt/yc2cfqkeVSkJbUS qPOdFW4kUBeouFtSoMX623ttttOJKuV9Fxnpp6kMznJdONazAEh6Dp8Aj5cS5Q== 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=1786379603; 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=QtP4DsvX83W1hEtbOBw5yiA2uCyqYV5xH7BIK/G5kng=; b=fN8y6i/3Vfy0soUz6lWxinWct5TfS7ylS/5HP5Rm47tbtH1seday7qZcdGVohF6bpsk2A/ bpC5ANFnTs52iYHE+s06sbWHv/UmeXMhJa1MeYYxAeGxpvERGlfDk1niS43Fe07+UyTHhk 2ygJ/K+kCEtAu7xYSEoTZO1AAUtcedWMlfs9e1ZbKppk9S1nBR3TEi1TjYoyo2ltazQPHW rG9BBX9xXfnvcsUt8+8Y/tZd8FeLtI+GSWefikbY4PyF542bkFJgmzFy8kRcxN2GsWWk7i xQdOiLTl2nTKx4rZI4cSPnUFiUyNSKhsUQ9JbpPz8Wb03MeZOCR5H82jq/WnBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJgKv0knmz1bM for ; Mon, 10 Aug 2026 16:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d3b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 16:33:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: be3e1068ea86 - main - ixgbe: Validate EEPROM checksum section bounds 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: be3e1068ea8699fb719691453899ca20a601fe1d Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 16:33:23 +0000 Message-Id: <6a79fd53.38d3b.407282fb@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=be3e1068ea8699fb719691453899ca20a601fe1d commit be3e1068ea8699fb719691453899ca20a601fe1d Author: Kevin Bowling AuthorDate: 2026-08-10 15:09:41 +0000 Commit: Kevin Bowling CommitDate: 2026-08-10 16:33:12 +0000 ixgbe: Validate EEPROM checksum section bounds The generic checksum walker trusts NVM section pointers and lengths and iterates with a 16-bit index. A corrupt section that crosses the end of the EEPROM can wrap the index and leave the driver in an effectively unbounded read loop during attach. Validate each non-empty section against the discovered EEPROM word size before reading it, and use widened arithmetic for the inclusive end and iterator. MFC after: 2 weeks --- sys/dev/ixgbe/ixgbe_common.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index 5965e1146175..3ee6885dcad9 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -2221,7 +2221,8 @@ static void ixgbe_release_eeprom(struct ixgbe_hw *hw) s32 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw) { u16 i; - u16 j; + u32 j; + u32 word_end; u16 checksum = 0; u16 length = 0; u16 pointer = 0; @@ -2248,6 +2249,10 @@ s32 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw) /* If the pointer seems invalid */ if (pointer == 0xFFFF || pointer == 0) continue; + if (pointer >= hw->eeprom.word_size) { + DEBUGOUT("EEPROM pointer outside word range\n"); + return IXGBE_ERR_EEPROM; + } if (hw->eeprom.ops.read(hw, pointer, &length)) { DEBUGOUT("EEPROM read failed\n"); @@ -2256,9 +2261,14 @@ s32 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw) if (length == 0xFFFF || length == 0) continue; + if (length >= hw->eeprom.word_size - pointer) { + DEBUGOUT("EEPROM section outside word range\n"); + return IXGBE_ERR_EEPROM; + } - for (j = pointer + 1; j <= pointer + length; j++) { - if (hw->eeprom.ops.read(hw, j, &word)) { + word_end = (u32)pointer + length; + for (j = (u32)pointer + 1; j <= word_end; j++) { + if (hw->eeprom.ops.read(hw, (u16)j, &word)) { DEBUGOUT("EEPROM read failed\n"); return IXGBE_ERR_EEPROM; }