From nobody Thu Jan 20 14:58:43 2022 X-Original-To: dev-commits-src-all@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 AC568195B4FF; Thu, 20 Jan 2022 14:58:44 +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 4JflyD1WHxz3lVt; Thu, 20 Jan 2022 14:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690724; 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=/B5rZxD91D71xTfRzWX9Yo0p2K3sECaNggPS3KHSDGw=; b=k4s398saAQG+/k+PWNV40cvxn163LZqdbwCbRbavOviwkmnlFJKAn2llIazrllMzbxzKmr FRj0hfmO8J6O+M7kGQxp7J28vMLISGzXfjl+Bz33L2mcLAxDnzlKzh9QILk+5TbAv7pVs3 4AFj6lpgD2PwE9ewSOqML0hfMYPyyh0cLuRHidrtKdSOQcmw1ELXIvg0S+xk6T6EObWmn1 qs67nRKnM+79Thra5cCgouQ7lohrkXuTunpYQT4Cb77+uIIwimKYyp0dG3qDBMtU/LHFoA mV+ezP9gXEfcdKWP0jaYZa/4erYb+YiVdiyyA0GPyF7Z1sl7x4nu0gqtbpaT3Q== 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 C92902367; Thu, 20 Jan 2022 14:58:43 +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 20KEwhPf078594; Thu, 20 Jan 2022 14:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KEwh9P078593; Thu, 20 Jan 2022 14:58:43 GMT (envelope-from git) Date: Thu, 20 Jan 2022 14:58:43 GMT Message-Id: <202201201458.20KEwh9P078593@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: 526ddf174ee9 - main - vtnet: Mark MRG_RXBUF headers as initialized before loading fields List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: 526ddf174ee9eade8902800cf3d546c7ddc35979 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690724; 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=/B5rZxD91D71xTfRzWX9Yo0p2K3sECaNggPS3KHSDGw=; b=KnLc74NhsWzhgJo5fyuTyWN97+hYF+0Huy05q9YpY2LnBhENyIfJ5QzDDkOdBllgX5oooH ZnProlb+5vZCHP835H6KdM5lHc33wE+fhJd3w+12n9EvhAoShH/UPFJhN8gdXq1RrJjeKI WIPtS+DUAHWCIYjpiKy5zqTSindf+TK89KoBHnZLf+U/pnA4xA7TS54SF68tvOsW7aQpK0 o+lNPk4DczWMAKeKrFTHcJ5ulSsIgC70/Ma9tHJ2eS0b8fGgpUG3svVgguJUpM6rVm5oCH ERwppobhBQoMNgm1oRMRANI0r6Sef7WDa/7d5l/sh/C5DCpnkdCvosQanLWJXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642690724; a=rsa-sha256; cv=none; b=KENJPMSLx9/0kDmQPoVsQyy7a7Qx5lP8ulHAMVIavdXu78CfmI7pBBNAglJ3y4YhaD3dUM W8W/jtuhgaBjhBw6NS6YTadNi9affZhkmRBMiWQ/tkThtF2qNV3pW+0g6m6NXudFrfBvHG DTF4fuS3+Yy/+CcHFrYGtug1sPxR+nvj0ZmsLlKCI+pBw0QVK5/o4WvNbY6ebWEMn1q5u4 ueLPOZPsUP6pgjBBg+xnA4uMNi+e/5XZU+fsodTqcn7dHn8CfhfrIcI845qO/DkgSBeCP6 8x0EYyLY/hK/IUcNeOnLwhTFj1c2bBa7/+EJxZ680bO7nAJ7j5GqWHhCCWTcGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=526ddf174ee9eade8902800cf3d546c7ddc35979 commit 526ddf174ee9eade8902800cf3d546c7ddc35979 Author: Mark Johnston AuthorDate: 2022-01-20 13:25:14 +0000 Commit: Mark Johnston CommitDate: 2022-01-20 13:25:14 +0000 vtnet: Mark MRG_RXBUF headers as initialized before loading fields MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/virtio/network/if_vtnet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index d52a1bfcdc23..7cbbe56e6c6b 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2084,6 +2084,7 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) if (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) { struct virtio_net_hdr_mrg_rxbuf *mhdr = mtod(m, struct virtio_net_hdr_mrg_rxbuf *); + kmsan_mark(mhdr, sizeof(*mhdr), KMSAN_STATE_INITED); nbufs = vtnet_htog16(sc, mhdr->num_buffers); adjsz = sizeof(struct virtio_net_hdr_mrg_rxbuf); } else if (vtnet_modern(sc)) {