From nobody Sat Jan 08 04:29:30 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 DCF2A1932187; Sat, 8 Jan 2022 04:29:32 +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 4JW6Yl2RKnz3DZ6; Sat, 8 Jan 2022 04:29:31 +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 F04DB18639; Sat, 8 Jan 2022 04:29:30 +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 2084TUm7022218; Sat, 8 Jan 2022 04:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2084TUvk022217; Sat, 8 Jan 2022 04:29:30 GMT (envelope-from git) Date: Sat, 8 Jan 2022 04:29:30 GMT Message-Id: <202201080429.2084TUvk022217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2c9a1c22c323 - main - msdosfs: take inusemap inconsistency as an error, not invariants violation 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c9a1c22c323b069d1f4883170349545c94b7b8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641616171; 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=KgiPFS2vixpEepcXbQICijhi/+w873co/RqnKDxT9OQ=; b=TKoxICTCOYsKzL5MZ+ukH4n7hs3RkH8R97BQPZ4BtD9w//CQ8Edq2y7UwRtgy2hTGtoMao kzHEw9W5b4+RcQJrK2utIp+0QTWTh+xOHzwSxPpTSEhpUx4xJhWeIGwA8DIrFC2kbUQTA4 BDHvO348F5ILBWQOjbrJVE5e434/e5EBP/aI89UmG4uKLws8cbA9aMn+LriVhj0n3PviCt r75RoqywzYCW3x2xcmCuL3s39UelbBimkoOTSByZV36fq3Un5JrnmHDLn+3AhLjdXM1JRE DgrSDac0SjfxnmHPohZHB4L3LyOTlmpw/+l3iTYjtfYlAqAeCH/ayHMldvM0eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641616171; a=rsa-sha256; cv=none; b=T7HH1ZrvnaPmlD5b9Tu6QNxR43y1mskpMOMT4dzWmjKJ1NnsviKS3Yrv37KodffTz0J74X dF34XZ2F7hGg0X46qw7eUq9fk5h6/PscIOmvFk4eGA3ti5yRDftmrzlgmy4vfbbUITpzhl rBuT/kcbUSfYeGkGwvhJpco+MXJjetIvVfusInHzRp9K2JaQm0ACZUAfv9B6jcYiHvw065 LFgxPbXIgWKGqNq3T4Y+8XWQ9FSjR40yUvJdnQf5ukkVBlIf54syIH7wd3QIbtxTKnbbV8 1evVGBJQOYJPb9bfc1g+hnAa+lSXY9Uyhfrj+8r5yx9PuuruXllDjULF+yFFGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2c9a1c22c323b069d1f4883170349545c94b7b8d commit 2c9a1c22c323b069d1f4883170349545c94b7b8d Author: Konstantin Belousov AuthorDate: 2021-12-25 18:39:15 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-08 03:41:44 +0000 msdosfs: take inusemap inconsistency as an error, not invariants violation In other words, stop silently accepting freeing free cluster in non-debug kernels, but return the error to the caller. Modify callers to handle errors from usemap_free(). In collaboration with: pho Reviewed by: markj, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33721 --- sys/fs/msdosfs/msdosfs_fat.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 6d5bfc7fa46e..202feeef0102 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -80,8 +80,7 @@ static void updatefats(struct msdosfsmount *pmp, struct buf *bp, u_long fatbn); static __inline void usemap_alloc(struct msdosfsmount *pmp, u_long cn); -static __inline void - usemap_free(struct msdosfsmount *pmp, u_long cn); +static int usemap_free(struct msdosfsmount *pmp, u_long cn); static int clusteralloc1(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got); @@ -398,7 +397,7 @@ usemap_alloc(struct msdosfsmount *pmp, u_long cn) pmp->pm_flags |= MSDOSFS_FSIMOD; } -static __inline void +static int usemap_free(struct msdosfsmount *pmp, u_long cn) { @@ -408,13 +407,17 @@ usemap_free(struct msdosfsmount *pmp, u_long cn) pmp->pm_maxcluster)); KASSERT((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0, ("usemap_free on ro msdosfs mount")); + if ((pmp->pm_inusemap[cn / N_INUSEBITS] & + (1U << (cn % N_INUSEBITS))) == 0) { + printf("%s: Freeing unused sector %ld %ld %x\n", + pmp->pm_mountp->mnt_stat.f_mntonname, cn, cn % N_INUSEBITS, + (unsigned)pmp->pm_inusemap[cn / N_INUSEBITS]); + return (EINTEGRITY); + } pmp->pm_freeclustercount++; pmp->pm_flags |= MSDOSFS_FSIMOD; - KASSERT((pmp->pm_inusemap[cn / N_INUSEBITS] & - (1U << (cn % N_INUSEBITS))) != 0, - ("Freeing unused sector %ld %ld %x", cn, cn % N_INUSEBITS, - (unsigned)pmp->pm_inusemap[cn / N_INUSEBITS])); pmp->pm_inusemap[cn / N_INUSEBITS] &= ~(1U << (cn % N_INUSEBITS)); + return (0); } int @@ -432,11 +435,11 @@ clusterfree(struct msdosfsmount *pmp, u_long cluster, u_long *oldcnp) * bit in the "in use" cluster bit map. */ MSDOSFS_LOCK_MP(pmp); - usemap_free(pmp, cluster); + error = usemap_free(pmp, cluster); MSDOSFS_UNLOCK_MP(pmp); - if (oldcnp) + if (error == 0 && oldcnp != NULL) *oldcnp = oldcn; - return (0); + return (error); } /* @@ -712,7 +715,7 @@ chainalloc(struct msdosfsmount *pmp, u_long start, u_long count, error = fatchain(pmp, start, count, fillwith); if (error != 0) { for (cl = start, n = count; n-- > 0;) - usemap_free(pmp, cl++); + (void)usemap_free(pmp, cl++); return (error); } #ifdef MSDOSFS_DEBUG @@ -846,7 +849,12 @@ freeclusterchain(struct msdosfsmount *pmp, u_long cluster) } lbn = bn; } - usemap_free(pmp, cluster); + error = usemap_free(pmp, cluster); + if (error != 0) { + updatefats(pmp, bp, lbn); + MSDOSFS_UNLOCK_MP(pmp); + return (error); + } switch (pmp->pm_fatmask) { case FAT12_MASK: readcn = getushort(bp->b_data + bo); @@ -940,8 +948,13 @@ fillinusemap(struct msdosfsmount *pmp) #endif brelse(bp); return (EINVAL); - } else if (readcn == CLUST_FREE) - usemap_free(pmp, cn); + } else if (readcn == CLUST_FREE) { + error = usemap_free(pmp, cn); + if (error != 0) { + brelse(bp); + return (error); + } + } } if (bp != NULL) brelse(bp);