From nobody Tue Oct 03 22:14:11 2023 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 4S0XD42qpFz4w3kM; Tue, 3 Oct 2023 22:14:12 +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 4S0XD374Pnz4sRD; Tue, 3 Oct 2023 22:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696371252; 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=70wGmAoku8H9gO49mTIpzrx2sCYQ2H8Gui4zLBy/zwI=; b=KBgBClaKsKHJKzhRs3KVmR4M9/SxND7hko0u1GhCrsszzfuJW7Xft0bfMC5ucGVPxPEXaC 6d+OYj+cXgxL9LaHEq4HMMwvhPggISIzW7MfURonzmoipnW+YEpFOYHPrvzDHkIlhlIzsx HqjPJSk4qnTsmQAQ9cwICmrwe4rZkh5Hsx4QxM0PSQaQxUXOwEZ8JqSYampnzlBQus6H6Z 8NYn8CoPQ17ihMgujCmH0hJxVIT7uKGaHpNF0nPss04pCH50ppPQERmhkaYLE+iGEqxKuS /B47r7oPzojBjVbKuWwUcFnP8cnzlNAmNiN5RhWV+HPXkrS+M/UaiYNR/8UM4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696371252; a=rsa-sha256; cv=none; b=BJpaqp/TxwS3TLeq+3zxv/ZhMTvA9tHbbOE0ONmthYVQaSBvite/aq7c/CDeEXWklav79W FZpUVoKCWbXr2Cx5Hfpf5wYZs7j8lmCePsfs22k/OMMAhF146AfvrKp9T/0KrfiZSDRIPx vdln5O1+MtLP4lvU+NCTlyjqasNSaFYpo6oG5G2jV2SETx9Ceold44ABfir/nk663sV1kg AUBrD4o432VBaEydX2TW6gnqPk+4/rY53H9MLFQdN9ZlPKD85SpqCkVYfThw5GkH9Dthm2 XvDnQyj9g5DWv6CTU/prK7qKolKy6sjCTm+0hGOxOdlaDO3y2NBeXXcsNL3OlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696371252; 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=70wGmAoku8H9gO49mTIpzrx2sCYQ2H8Gui4zLBy/zwI=; b=olS64llP7GqF4Y6WszF63SxpPPDmCqszwOKOxqbASW26wL5efM2Zwrw2zNJaBloy7u7GVi Dpll8zEyiCqjeDN8nHJUbxFqz362h8h0phWUuEhZX35mL2ue0yKWB+QkOwXsckDwcJYZmH qdRkTRh+1GLKDkJzlmmRrCmOjubQjCIj86ypHbpz7mkM06I/gVJACFgRorSqv4bMTpYNT6 gGVKSX2AxfNrhZL31iU0GzMyMhKRYcmpwhULeSETNHiRWnRypZh6+9vioemcrT9mZYvhS5 j7WsEPCQEXXdiiXlfPJCQ8nPzB9qAsswBLjskDhoQaol5ddjoXQYd19lR+XrFw== 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 4S0XD36BHdz1C0X; Tue, 3 Oct 2023 22:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393MEBIX071419; Tue, 3 Oct 2023 22:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393MEBoB071416; Tue, 3 Oct 2023 22:14:11 GMT (envelope-from git) Date: Tue, 3 Oct 2023 22:14:11 GMT Message-Id: <202310032214.393MEBoB071416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: bb2ccf50d7f7 - releng/12.4 - msdosfs: zero partially valid extended cluster 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: bb2ccf50d7f7c740743b29a26e2444e364df431e Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=bb2ccf50d7f7c740743b29a26e2444e364df431e commit bb2ccf50d7f7c740743b29a26e2444e364df431e Author: Gordon Tetlow AuthorDate: 2023-10-03 21:14:47 +0000 Commit: Gordon Tetlow CommitDate: 2023-10-03 21:14:47 +0000 msdosfs: zero partially valid extended cluster Approved by: so Security: FreeBSD-SA-23:12.msdosfs Security: CVE-2023-5368 --- sys/fs/msdosfs/msdosfs_denode.c | 53 +++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index db9e0712d2b1..3b4e809d6196 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -365,10 +365,8 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) return (EINVAL); } - if (dep->de_FileSize < length) { - vnode_pager_setsize(DETOV(dep), length); + if (dep->de_FileSize < length) return deextend(dep, length, cred); - } /* * If the desired length is 0 then remember the starting cluster of @@ -477,13 +475,16 @@ int deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; + struct vnode *vp = DETOV(dep); + struct buf *bp; + off_t eof_clusteroff; u_long count; int error; /* * The root of a DOS filesystem cannot be extended. */ - if ((DETOV(dep)->v_vflag & VV_ROOT) && !FAT32(pmp)) + if ((vp->v_vflag & VV_ROOT) != 0 && !FAT32(pmp)) return (EINVAL); /* @@ -503,15 +504,47 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) if (count > pmp->pm_freeclustercount) return (ENOSPC); error = extendfile(dep, count, NULL, NULL, DE_CLEAR); - if (error) { - /* truncate the added clusters away again */ - (void) detrunc(dep, dep->de_FileSize, 0, cred); - return (error); - } + if (error != 0) + goto rewind; } + + /* + * For the case of cluster size larger than the page size, we + * need to ensure that the possibly dirty partial buffer at + * the old end of file is not filled with invalid pages by + * extension. Otherwise it has a contradictory state of + * B_CACHE | B_DELWRI but with invalid pages, and cannot be + * neither written out nor validated. + * + * Fix it by proactively clearing extended pages. Need to do + * both vfs_bio_clrbuf() to mark pages valid, and to zero + * actual buffer content which might exist in the tail of the + * already valid cluster. + */ + error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, + NOCRED, &bp); + if (error != 0) + goto rewind; + vfs_bio_clrbuf(bp); + eof_clusteroff = de_cn2off(pmp, de_cluster(pmp, dep->de_FileSize)); + vfs_bio_bzero_buf(bp, dep->de_FileSize - eof_clusteroff, + pmp->pm_bpcluster - dep->de_FileSize + eof_clusteroff); + if (!DOINGASYNC(vp)) + (void)bwrite(bp); + else if (vm_page_count_severe() || buf_dirty_count_severe()) + bawrite(bp); + else + bdwrite(bp); + + vnode_pager_setsize(vp, length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; - return (deupdat(dep, !DOINGASYNC(DETOV(dep)))); + return (deupdat(dep, !DOINGASYNC(vp))); + +rewind: + /* truncate the added clusters away again */ + (void)detrunc(dep, dep->de_FileSize, 0, cred); + return (error); } /*