From nobody Wed Jul 6 21:45:58 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 5AF951D14300; Wed, 6 Jul 2022 21:45: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 4LdY524hBzz4b2X; Wed, 6 Jul 2022 21:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657143958; 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=AhUotSfL8uF3AR7TnxZXu9DXfF4S5EDSLShUGkxM8II=; b=j+TMRzm/TfkxST0Pp6r5VKTYZ4hCkQPBQPG8XIjPWEr8lU9S4XE1n8X2E4QUhXatBRdAdz h+VGtOyvYWWbS81YcT6DdbH+UbnwcW9Qz0hQSO/BeFSJpLNbTb+kxovFrXvN/P+wqXPg1c ban4ohPZRccXDp4VrlFniZgeKkl1h8dMq4wZu0eNfwNxbC3FAuU97Q2sd4X0uE2L6jFEEk oRDp7Cz0zshzmn+xdrZetqUr+n+Jky28R3fr0irVE7QcE2G6G0/40GXvhX5EXUQGSwDF04 Svgvl5g8ba5CyC0BzB4pIINN3g5rnlngkQC++vl+L+8D4m9TqAPJ2rqbrgAraQ== 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 82084227D0; Wed, 6 Jul 2022 21:45: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 266Ljwui064317; Wed, 6 Jul 2022 21:45:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266LjwV5064316; Wed, 6 Jul 2022 21:45:58 GMT (envelope-from git) Date: Wed, 6 Jul 2022 21:45:58 GMT Message-Id: <202207062145.266LjwV5064316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 5bc926af9fd1 - main - Bug fix to UFS/FFS superblock integrity checks when reading a superblock. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bc926af9fd1c47f74356734f731c68145e31c6f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657143958; 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=AhUotSfL8uF3AR7TnxZXu9DXfF4S5EDSLShUGkxM8II=; b=OnPfUA7J1aTg5Nt0uL53mDYFij8t/d59fmOFTDHhUHZ9ErvmdE/5XOMK3MIsUX5hPe6TrZ bcOdm9gpt4b73NVDdLJT0tvsJa2qhAKxzHgPlXXrZJFqk9jUZnYFeXYsfpglsCxGXgobey /kq6wNsFubQz7I6IpXwwp/KGFMmHefArs03IR7R0Gbmq7paDtP136GsDnMox/5a/I5AfGw MxDdEtqi3d6bOPid1z+pGP7Qt6YCSSsOFO32dzfaHJXjEhlHio9ChmroFKJpoDlsjI41VE 8qmtX82dPJXW+JDj+l5MrLMTVBP/Men3UBsPYLO3nrgyJxdC+WqhTkFprH3Szw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657143958; a=rsa-sha256; cv=none; b=VuRFb+LmZj7ZWUi5i12/lLE8vR/bwve9M0XIq3xdjdrARaN4rWOEy1tpMytAaLm4H0W+az ymvfq1yAx/dMulQRcX30yGZp488IhKXKVf/U0OdW7qvPNDdmJ8ISznlT2tY6mP1R1uN//g RP3ugCiLaWFXW4wdfXy1gqcLSE9ziR2yWFP8vF+YJJYZeUMOK1WPolUml1ZV9h0yoD7Fes naOTVwI0gR5IMs5bEzcOBnEFP8mfwZgeSomtlvdSIabUKoNizb2DVC2zRQX227gdu7iz8A 4JAqkCDN2zKd6Bi9RLeSuyWg6MUVvLNIpz4ZSK31cCX8kKBPsUmf2vNr7xhNmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=5bc926af9fd1c47f74356734f731c68145e31c6f commit 5bc926af9fd1c47f74356734f731c68145e31c6f Author: Kirk McKusick AuthorDate: 2022-07-06 21:38:19 +0000 Commit: Kirk McKusick CommitDate: 2022-07-06 21:45:30 +0000 Bug fix to UFS/FFS superblock integrity checks when reading a superblock. Older versions of growfs(8) failed to correctly update fs_dsize. Filesystems that have been grown fail the test for fs_dsize's correct value. For now we exclude the fs_dsize test from the requirements. Reported by: Edward Tomasz Napiera Tested by: Edward Tomasz Napiera Tested by: Peter Holm MFC after: 1 month (with 076002f24d35) Differential Revision: https://reviews.freebsd.org/D35219 --- sys/ufs/ffs/ffs_subr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index d87579832617..25657a00894f 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -422,9 +422,16 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_cgsize, >, fs->fs_bsize, %jd); CHK(fs->fs_cssize, !=, fragroundup(fs, fs->fs_ncg * sizeof(struct csum)), %jd); + /* + * This test is valid, however older versions of growfs failed + * to correctly update fs_dsize so will fail this test. Thus we + * exclude it from the requirements. + */ +#ifdef notdef CHK(fs->fs_dsize, !=, fs->fs_size - fs->fs_sblkno - fs->fs_ncg * (fs->fs_dblkno - fs->fs_sblkno) - howmany(fs->fs_cssize, fs->fs_fsize), %jd); +#endif CHK(fs->fs_metaspace, <, 0, %jd); CHK(fs->fs_metaspace, >, fs->fs_fpg / 2, %jd); CHK(fs->fs_minfree, >, 99, %jd%%);