From nobody Thu Oct 29 08:05:10 2026 X-Original-To: dev-commits-src-branches@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 4jFcGZ53Hwz6wHgD for ; Thu, 29 Oct 2026 08:05:10 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFcGZ20yvz4bD9 for ; Thu, 29 Oct 2026 08:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793261110; 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=GMY9/gUEhFFm0O4a7ewPLG1cWVqHH75AqCqUiTlvIvU=; b=YkFmfopRLPcikHqlylKbTUVMHzY5KYcPqklXnKHqiIYOzlQualcheauLuW4AjghPz1CRf/ DHPIp5wdFQ9oQ4qVBs7EOIffP/q7ACVD1STfhkr6AtUg0EyuLKkGzsDJ+LzSkb1eVNjKOS uvxzoMzxw1SoOZ7Noh8jpR4GaSl8ekIkxWWdaeUFpeSsjW47S5Z84ZSJlSCNUrvP3jYxRt GBUMXggtwjgFGF1A6kgVWVKEkjcY+Tp6dLStHNwZvnZh7X7oRxINM18OYx5x61yJetkMQ1 mo21oU6rTO2nmG6zJu8qhHCEOX7cAfpkPAGposHDvcPDDRkShdP8h9VS+sNRdw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793261110; b=b0cIdtW2PCLvOnXascUyGauVKKmLXgsVRbnUUb5Ptrm2JHoPNCyNvgsii/n5fqcXrYLEBc tzzVdO67s49f4QKK1XGrs/hQwpbw4d7Ilh3mgWXpaEO8mEc6bNY41td8jVlzDW2vgkoeEw Oc3RrIPLsVPBCc6hmXHHHtjcz3HDQDYwLucnkYanD1j8XpNsMORG7bi/GAgwuKuMHGEJKh ppElcACHPNbWY1Ike3SwJRrx9jQNQvEGtdYhM4jNRUKdPrVI8CUZvb5H0UU4fUih3kAU+g 60JpwVc+3v3+2VcuRB9ugAIyZuNbmaxn+rguEbTjaC/TseaCR13rn9xxBYHW2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793261110; 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=GMY9/gUEhFFm0O4a7ewPLG1cWVqHH75AqCqUiTlvIvU=; b=QT3Z/MqfM3mOn8Glfd61kpXxEQ46DV1kD4+nGEtMe4oeAiQOUKyEd1x3HAH4TYEspUqquY ZWYCMfsrucaLKF0umulK/89H2jXXTDGoh2mlL0BottueBuKRHxxYAfpzRz6RBgJ02mnemy EbIaQJIYPflrlXC7JzT6i7j0pQDJicgl1Gp2sVFJzDYnwQ5oiqr/V3xIE+tZg+h3ZTGr+C +0wLHoA2Ps9agHVLR8f6+NX5MeTf+70zPyYtwPjqkcWSesu5xD6VDimVZLisKbLMEATO2h D+1rYTjpJgjEh8E9yRYL7YvQ2PGA/Ud7ow1p+yUWmJ55cu1g4wN/Jrm6uzkQ9Q== 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 4jFcGZ1YtKzVwF for ; Thu, 29 Oct 2026 08:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4670b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 08:05:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ruslan Bukin From: Kevin Bowling Subject: git: 9fa05aec8459 - stable/15 - em(4): fix capability bounds needed to access checksum context. List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9fa05aec84599786e159934deadd553fda8e2272 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 08:05:10 +0000 Message-Id: <6ae2fe36.4670b.51fc26ec@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9fa05aec84599786e159934deadd553fda8e2272 commit 9fa05aec84599786e159934deadd553fda8e2272 Author: Ruslan Bukin AuthorDate: 2025-11-25 09:16:39 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 08:02:02 +0000 em(4): fix capability bounds needed to access checksum context. Ensure the offp capability bounds cover entire struct with checksum fields. This is needed for CHERI systems to avoid bounds violation trap, as otherwise offp allowed to dereference 4 bytes of csum_flags field only so bzero failed. Tested on ARM Morello. Reviewed by: kbowling Discussed with: jrtc27 Sponsored by: CHERI Research Centre Differential Revision: https://reviews.freebsd.org/D53903 (cherry picked from commit 64ee9c166ce5e807e575d205ac2e15cc5cf6581b) --- sys/dev/e1000/if_em.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index bfcb8d808344..7829bd7a2f64 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -5119,7 +5119,7 @@ em_initialize_transmit_unit(if_ctx_t ctx) bus_addr = txr->tx_paddr; /* Clear checksum offload context. */ - offp = (caddr_t)&txr->csum_flags; + offp = (caddr_t)txr + offsetof(struct tx_ring, csum_flags); endp = (caddr_t)(txr + 1); memset(offp, 0, endp - offp);