From owner-dev-commits-src-main@freebsd.org Wed Aug 11 20:44:49 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 261C165B60F; Wed, 11 Aug 2021 20:44:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GlMJK0KzRz4Vhy; Wed, 11 Aug 2021 20:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D32FD16040; Wed, 11 Aug 2021 20:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17BKimxT092291; Wed, 11 Aug 2021 20:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17BKimmt092290; Wed, 11 Aug 2021 20:44:48 GMT (envelope-from git) Date: Wed, 11 Aug 2021 20:44:48 GMT Message-Id: <202108112044.17BKimmt092290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 24fe46128495 - main - ether: Add a KMSAN check for transmitted frames MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24fe46128495fc32b31729d9bba86dd7c5280ce3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2021 20:44:49 -0000 The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24fe46128495fc32b31729d9bba86dd7c5280ce3 commit 24fe46128495fc32b31729d9bba86dd7c5280ce3 Author: Mark Johnston AuthorDate: 2021-08-11 20:23:12 +0000 Commit: Mark Johnston CommitDate: 2021-08-11 20:33:41 +0000 ether: Add a KMSAN check for transmitted frames This helps ensure that outbound packet data is initialized per KMSAN. Sponsored by: The FreeBSD Foundation --- sys/net/if_ethersubr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 718de9625044..bdb5b07635b7 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -46,8 +46,9 @@ #include #include #include -#include #include +#include +#include #include #include #include @@ -502,9 +503,13 @@ ether_output_frame(struct ifnet *ifp, struct mbuf *m) #endif /* - * Queue message on interface, update output statistics if - * successful, and start output if interface not yet active. + * Queue message on interface, update output statistics if successful, + * and start output if interface not yet active. + * + * If KMSAN is enabled, use it to verify that the data does not contain + * any uninitialized bytes. */ + kmsan_check_mbuf(m, "ether_output"); return ((ifp->if_transmit)(ifp, m)); }