From nobody Tue Nov 25 09:22:00 2025 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 4dFxzD6hv5z6Hqlh for ; Tue, 25 Nov 2025 09:22:00 +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 4dFxzD5mhxz4377 for ; Tue, 25 Nov 2025 09:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764062520; 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=t3Oe04l2MgZ5vHxYyg0URGg5bVu0TBPKzVsT81UJx98=; b=FWA/Hq46mwGdpdPmSQEK1GGqiSi4ZQEWArWenT0IXE938eY3PH7xZPqyz+d5WXpnfmjsmj c0MmllPh3+/nIFIGlA+Z95DDIqxAiPZSzu5kFTP1ipx9Alf/TzAhqlOiRp9cFAKNWWOiKv yAvs+NT4v5RyLf+aQyRGzKHyjcybjIpnwSphiCndoMB17kPLeMQSeFfzArQy1OXP0zjtzu mufZRceaZXuxFZu8UXolUV2vZyfPr64fl6hQ+nrgmfWTBjDKwKIc8HhGqU/Ud1wKxVnXrN rYCWWlR40Aew4YAwJttEbiXegeYxiQXK8ZG1jW4gyeMGxiGtIlrmaWPqOhNjLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764062520; 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=t3Oe04l2MgZ5vHxYyg0URGg5bVu0TBPKzVsT81UJx98=; b=CHfLJD6kLMFFqZW74tFAJERArKHtW4d5aTLJakhtJl9F4RvbI9Lgf+5wjuZKq9AL/Of6UM DTUvz8Xd+cUyDQ4lYdCyykdVkIF0m01uyWRkXZOLbo/Q++GZbM04KVWrqhol7eFbkbswb4 58umX6ly49WmNkjFqXjYJGbkYptqCBQNzEC8AlfEqMZwbdRIoy/3pa1R7rdI0RLR7Oa4lx nod2YmSalnmki5Pg0cDHlEB1xziWctDXH+LBw/4ihwVlwxZCZkhn4VP+mEkeYIrdLNhTuS 6xbzlJg+xzv0WBxLj2csKKdjGdGLyB8fZ4gLCElc5bcoRtpSDMfmwad3iYJstQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764062520; a=rsa-sha256; cv=none; b=SCg6uChtOlWR71eNjiaw2x7V3UJd47lpWLe6lAwjKaYod9+8kdvbfbfILKXS8mF3Nhhzpw iERyPRnkg4DQ1yAuvfbeSny2Sc+bN66qpAHMZAvHbxUUXZ1TroqZ5/VgfS+n3hyMfGOfOi HZVgc2xHdBJiRHb26/j3HQtdHOIq5UkTsVqKBofGSyAB9K9PN98rlCehgHdaj+eHcYl5r2 tNUt8cO9/y3C+L+NQ2ZDP9dVEuvnHPT37FDRsG438w1PeY1j+jgkMfbJNueD0z04o1HHCc DsaOY/2B00SRx3PngdU7rvbw9s8ab8csIbOdgsXfOomx6epnLK3QV6CazcpRTQ== 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 4dFxzD5D3Wzvvx for ; Tue, 25 Nov 2025 09:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f1ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 09:22:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 64ee9c166ce5 - main - em(4): fix capability bounds needed to access checksum context. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64ee9c166ce5e807e575d205ac2e15cc5cf6581b Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 09:22:00 +0000 Message-Id: <69257538.2f1ed.5e0428f9@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=64ee9c166ce5e807e575d205ac2e15cc5cf6581b commit 64ee9c166ce5e807e575d205ac2e15cc5cf6581b Author: Ruslan Bukin AuthorDate: 2025-11-25 09:16:39 +0000 Commit: Ruslan Bukin CommitDate: 2025-11-25 09:20:03 +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 --- 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 bc841ba87ceb..7d7655a7ae6f 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3638,7 +3638,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); bzero(offp, endp - offp);