From nobody Sat Jun 11 18:05:36 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 EEFCB847473; Sat, 11 Jun 2022 18:05:37 +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 4LL5NK2QM7z4WvF; Sat, 11 Jun 2022 18:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654970737; 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=Mwgnirypr3ONQaIKj9RYGbpdE5CQjPcVNMjUBIzEt5U=; b=LXTxK1Omllt1pRuL8q8UrF4COkUGNRe38pT1yGg2dfkfHnTBmJMt0vd/dqbqQf/8lPSh3Z hUE0dEQRZwjv0At2brnpj93cRpFopJti+/huC24K93BFenMbYWjl9d/UMNIQF0DyrKdiWG isxV6wplbTA51qq7VoSI+uW4yzGabRNXmeXTJyPbREzLxVn9VaE/xE25QDFVHIpAhz7E4x pcFQEhObhHDXjMED5D5KidGfweMbEZzczdGn9wgq5lqPmuHyQqJw9zTh5pG22o9amZ/7nn wjOeM6vAY5MgKl0kizLSZzmUCcTy9v6y3pWvXOvl38erAvcL4/+jFEZSDU1w0Q== 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 00CE611FC6; Sat, 11 Jun 2022 18:05:36 +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 25BI5air019720; Sat, 11 Jun 2022 18:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25BI5a5r019719; Sat, 11 Jun 2022 18:05:36 GMT (envelope-from git) Date: Sat, 11 Jun 2022 18:05:36 GMT Message-Id: <202206111805.25BI5a5r019719@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: 800a53b445e7 - 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: 800a53b445e7eb113ba193b1ac98631299178529 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654970737; 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=Mwgnirypr3ONQaIKj9RYGbpdE5CQjPcVNMjUBIzEt5U=; b=jE18T0SxY0LNLqj3C/95TWSQZNuR3NKIUf6/eEil0yRC9BDvlkp0dGDIVctkHUv4AuIKcP ek2RiwQ88nWB81eOvX+8L8XAFBul7A+AfVL1h6nn3gBdgZ+H7kCJoq+ypoTKGVNZX2U8Wq HqDPDL3wzHKU6YJLyETOWFWBc+aPtbTeIOUwVzrZuIHg/0BWwepX6HBUVJIo7x4dTRwDHI K+iN2cilsdzvCfWDa0U/FFLmzXzhKLlt60OsW9gbkSVR4/fUgEzjihTpg0rQYUdG8ftb3x qqYk/VZQE9AOEM8vGROZ4DuGz4Qa6ParX5/QxB7yS974ubli43WRy6GPNvi/kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654970737; a=rsa-sha256; cv=none; b=xrB9Zz2MtcAHvPdTMXbpXTRpl8yxAtLDMhU0iloyh85oqgKgpWvW+Yc4CZ1cQ7lVADqxqF aUp3xokxKJ0IlaD/gJn4/cHXHuAm+XA0qwcP4NmgKQiVQISdyiD/cPjA2swZ/YVzQ5bzJ0 j0MEn5Kg0b8qCZbcwJq1/glZgXyQmrM8mpnSRkeZ+KiYyQiizqw/bR+kYBqyLJdQPTS+pV FXZ5EkKrjYnh/EoP09ELRJw0oT5YmSVKZd3wtvf7l563AYWrStJnI36sdSxkc/GWL96BB3 hrfjfHW4BTVOX6sWbLPk+0X8qTb6MIcbIkAZJzVQfgAMJl4mA/NWhBLMKiKSYg== 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=800a53b445e7eb113ba193b1ac98631299178529 commit 800a53b445e7eb113ba193b1ac98631299178529 Author: Kirk McKusick AuthorDate: 2022-06-11 18:04:19 +0000 Commit: Kirk McKusick CommitDate: 2022-06-11 18:05:14 +0000 Bug fix to UFS/FFS superblock integrity checks when reading a superblock. One of the checks was that the cylinder group size (fs_cgsize) matched that calculated by CGSIZE(). The value calculated by CGSIZE() has changed over time as the filesystem has evolved. Thus comparing the value of CGSIZE() of the current generation filesystem may not match the size as computed by CGSIZE() that was in effect at the time an older filesystem was created. Therefore the check for fs_cgsize is changed to simply ensure that it is not larger than the filesystem blocksize (fs_bsize). Reported by: Martin Birgmeier Tested by: Martin Birgmeier MFC after: 1 month (with 076002f24d35) PR: 264450 Differential Revision: https://reviews.freebsd.org/D35219 --- sys/ufs/ffs/ffs_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index f25a6cba12f4..3e31746c2cfc 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -385,7 +385,7 @@ validate_sblock(struct fs *fs, int isaltsblk) roundup(howmany(SBLOCKSIZE, fs->fs_fsize), fs->fs_frag) || fs->fs_iblkno != fs->fs_cblkno + fs->fs_frag || fs->fs_dblkno != fs->fs_iblkno + fs->fs_ipg / INOPF(fs) || - fs->fs_cgsize != fragroundup(fs, CGSIZE(fs))) + fs->fs_cgsize > fs->fs_bsize) return (ENOENT); if (fs->fs_csaddr != cgdmin(fs, 0) || fs->fs_cssize !=