From nobody Sun Feb 19 05:47:18 2023 X-Original-To: dev-commits-src-branches@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 4PKF1g1hRfz3smWG; Sun, 19 Feb 2023 05:47:19 +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 4PKF1f46TXz3L7L; Sun, 19 Feb 2023 05:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785638; 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=DL+zyS2qr3y7Sp8UUyNkoJmqsqby5FkQovdPdcDL9cg=; b=F+P3cu/XqO0KQf/8XVhpo9ox1xc/tZcjZrUOF/7GUGxwBsAIzvLYxOMNtDMuRDJim606QP gA7IUqu90fzm3va93c77O85ru/vHaRysPQBwnNwmIAPfFRJRkkdjISsK42AqL65fuL9pMX wIdMcti6OxrpiC7uM8jrv46B5edSYSJTRH7G3msoLE1P4drdgmIGP3y95+c1m8RqaT0lGl ZXw1Q0VnycTSn/7mcxshoxrAebvZTYyA6G7+yXk52Sv5nlGWlBTdTCcgBuCxsccgiy8Geq v5HfANmjOFq9Jcvq8X6NAnQHPV5SAit65q7/3HaE0eUDSWY0ygFbfzsZacggmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785638; 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=DL+zyS2qr3y7Sp8UUyNkoJmqsqby5FkQovdPdcDL9cg=; b=FwsY6tWBDe2emqBQHvh4gHHGkksSEfg5CzscKhonUXXALlLubg800P8Sipkut8Zi5W8Z77 ygEe1QB2qq5Kcod3RKQjQwXZyZZrdpqVm+aooklJmvbnxrFtLRhR7EqjY60UVijc76vIxJ sVowcQhKfjvjRbes80OTHWyo5yl1Mm3kolCboDuBV4BXdXqZbLshC3OWR9uym1ZjE6ncDK 7ItuWYZivIuMZLV6gmFxyzRnzYZ4UW9yv+uWv2nVZ44Kf2/Vle8AJPvx+oVcM+2c+amKdQ jPnt/n4CD4E+q4eJAueLwY+1t0M0knNnCU7CC4kGxV2KLxYKD7I2Oc66MnTAwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676785638; a=rsa-sha256; cv=none; b=Zre6M/ksUG9wawiwyMz+rX2wUu+TnZw9Q5Prm32XQ6jnToDK8dWaEvGg6q9D0cQtFBIlZd hczvesWv81icW9glHtVy4ZeryZTYHp4N0O+PYwNAKsgxrazyD7pvl+XkPL9yOg03I6rrGF RPPNNFHliT8YghFvwYQMBwkkHIQaZzty8k0dmjM0BYjkPRaXUt/tXLP6ReqrZHldJ7rKan PomXFbQq4Sd6RIT2DmmYAsXSzFA2kWf3avjdhK6bdzpV7Ih31nnbDFxMLx2Cp1yVpGyZUF Pn7oBybOclzKNVXbj6fQ0w1xhA9OfEvMIxdAosQ819ahi04p3LK5YfNhT9qovA== 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 4PKF1f3DVtzqw8; Sun, 19 Feb 2023 05:47:18 +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 31J5lIag097183; Sun, 19 Feb 2023 05:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J5lIvG097182; Sun, 19 Feb 2023 05:47:18 GMT (envelope-from git) Date: Sun, 19 Feb 2023 05:47:18 GMT Message-Id: <202302190547.31J5lIvG097182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c2ee668306bb - stable/13 - msdosfs deextend: validate pages of the partial buffer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2ee668306bbe3edf4a05246ed3a88f52dfc94ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c2ee668306bbe3edf4a05246ed3a88f52dfc94ae commit c2ee668306bbe3edf4a05246ed3a88f52dfc94ae Author: Konstantin Belousov AuthorDate: 2023-02-11 18:09:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-19 05:16:25 +0000 msdosfs deextend: validate pages of the partial buffer PR: 269341 (cherry picked from commit 0152d453a08fa2bad694dc04a8184fce2b7faa10) --- sys/fs/msdosfs/msdosfs_denode.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 003c710801ee..51c2e3beaf39 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -495,6 +495,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; struct vnode *vp = DETOV(dep); + struct buf *bp; u_long count; int error; @@ -521,16 +522,41 @@ 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. + */ + error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, + NOCRED, &bp); + if (error != 0) + goto rewind; + vfs_bio_clrbuf(bp); + 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(vp))); + +rewind: + /* truncate the added clusters away again */ + (void)detrunc(dep, dep->de_FileSize, 0, cred); + return (error); } /*