From nobody Mon Feb 6 16:24:58 2023 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 4P9WnR0RYXz3mvFV; Mon, 6 Feb 2023 16:24:59 +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 4P9WnR00Zvz4Jv9; Mon, 6 Feb 2023 16:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675700699; 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=i0j2l0MrtEM2i3WISqFpIzFknZlG0WgUCw1WoIDaJkQ=; b=D/sqDFGNcM27kUOucnLu4VPnn+CGnFrlBtoo5b9ie3bh7/SPKTDwTp+enGPSKDVknR3Mtu A5kBjUgqbBdk1LNzTciuPvuTUuZmbxzqx1XafZ+LXy24L/2aMbMqxLEJ3g+dLl5ctGUgfs IJLMWqiwtHeuR/NfFUMSo38kvSdJCAFynDDanDP14D6qrtKy+k2qwD1HHSLEfPUU3ADjNx 44tnNUC5hoHdcij3DVzI3FSoFJQ/oN3+nlK8Z0OwbqS7BFaGoP2yPE8A43XBlZl/8lN22Q O/Yw85gqNmyo3s0RJn6SolzlTQi6lvkehk6nqQr9IW+x+cmsfXO3JRr62DUIrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675700699; 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=i0j2l0MrtEM2i3WISqFpIzFknZlG0WgUCw1WoIDaJkQ=; b=so6+iZjGj6t1P5TNtka8qvkJjuf7RK53igj9tbDmYRBBgi+MrIjyutYRQqVuOgyd/6PpuD Ii1AAuumhEThDzgz2wu5XUQ8JD0lmTwPZxd8Mc/DMcL7PFN1OWnecyo2+GqFIGYQVrjNcj uqkCrNak/Gx/r6Onf98+VyX+1A0glTaUzCpipDnWKSkalpASiUThhnLlfnQeH9CMWkbklT GOZ09ifA+xKMGqBQzomYZPCrwCaoQTCLDCQjg0720+8BV5L9ePidoHibHVVnCUhh1Dj5v2 STYgvtFmuOCZ7R5N8IXh0CLgRsLWXg3ZT0aQZavVJ2MIKchWs3iGbkjKbaZCYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675700699; a=rsa-sha256; cv=none; b=C2o/CQnsRmi6drBUmRlYS1cQBO6kOrIhDnwFWSYI6SHDCU6/hFOnnuF031zEYfDi6zIVXh FRQqLPiLSoDZIpXwy/uiPMnekNd4eTq7REm+4QsCT+X4Vm0BpSgwz8HcLxh9+OrZiU3J41 YYYJTcdtq6dDP5QBffjTGnpGDdrusI2DyCS2ApFA23LhPs9Jf7CKEDC6/ROLm39zQY22FR u4MNTzkuENOjKiMMfLFRo1+hgDb0CzhH4j+19lE4O5uhgo8TkdcGHP0E+IljviDQ8DKq7t K8nx2TZ2FgzCP3L/CMwTA8LGDw+1iNg53AdYC082AclXC0H6CQxh3a6O/aXElw== 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 4P9WnQ697vzhHF; Mon, 6 Feb 2023 16:24:58 +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 316GOwUA044272; Mon, 6 Feb 2023 16:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316GOwI4044271; Mon, 6 Feb 2023 16:24:58 GMT (envelope-from git) Date: Mon, 6 Feb 2023 16:24:58 GMT Message-Id: <202302061624.316GOwI4044271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: c9ff56ce2d41 - main - tarfs: Terminate dirents before copying them out. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9ff56ce2d4126eac79342eff2facafbbbd3f39c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c9ff56ce2d4126eac79342eff2facafbbbd3f39c commit c9ff56ce2d4126eac79342eff2facafbbbd3f39c Author: Dag-Erling Smørgrav AuthorDate: 2023-02-06 16:24:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-06 16:24:27 +0000 tarfs: Terminate dirents before copying them out. Reported by: markj Sponsored by: Juniper Networks, Inc. Sponsored bu: Klara, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D38400 --- sys/fs/tarfs/tarfs_vnops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index a70a077424b4..43c434e370e3 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -294,6 +294,7 @@ tarfs_readdir(struct vop_readdir_args *ap) cde.d_reclen = GENERIC_DIRSIZ(&cde); if (cde.d_reclen > uio->uio_resid) goto full; + dirent_terminate(&cde); error = uiomove(&cde, cde.d_reclen, uio); if (error) return (error); @@ -317,6 +318,7 @@ tarfs_readdir(struct vop_readdir_args *ap) cde.d_reclen = GENERIC_DIRSIZ(&cde); if (cde.d_reclen > uio->uio_resid) goto full; + dirent_terminate(&cde); error = uiomove(&cde, cde.d_reclen, uio); if (error) return (error); @@ -374,6 +376,7 @@ tarfs_readdir(struct vop_readdir_args *ap) cde.d_reclen = GENERIC_DIRSIZ(&cde); if (cde.d_reclen > uio->uio_resid) goto full; + dirent_terminate(&cde); error = uiomove(&cde, cde.d_reclen, uio); if (error != 0) goto done;