From nobody Mon Oct 03 12:53:34 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 4Mh13g1Dxtz4V20T; Mon, 3 Oct 2022 12:53:35 +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 4Mh13g0gp9z3sFP; Mon, 3 Oct 2022 12:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664801615; 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=t63PkM+a5PPxKfVdxr7Pmnl/f+FP3HQ2pmqW6cOxfL0=; b=Iz4Ftkm007farKUgcHXKmH+PF8Ydmkz98w+yHQB/74+W4xEMQArOLAnc94cZ67Z6z/Ktbg lpeSMG7bPytFPdKUhkn5cyhOqwDT1mSuiS22uv5TMgnXdyYuVMV1+Otx5sQb+OSqIqDAIN 0ySIQ86r+/y6mXGCkrOP2WLwrgA3kzPmQXCGQLteOVBBfhnBZkp4zQsR6Go4i8u91m5Q/E C6r8PD2C4kg5EVpwrC7szh2Bq+EcKeAr4Ar6PAtTrJZcy80OeKdp5pvVWR9UuyCpTr5mOb DQUc3JFE5dJbDJdjGQH6UqT+GeS1SxiFDXJx/euB5E65KOhuw6FFzVPRmBX1vg== 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 4Mh13f6pyVz1CFs; Mon, 3 Oct 2022 12:53:34 +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 293CrYUi084620; Mon, 3 Oct 2022 12:53:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293CrYJX084619; Mon, 3 Oct 2022 12:53:34 GMT (envelope-from git) Date: Mon, 3 Oct 2022 12:53:34 GMT Message-Id: <202210031253.293CrYJX084619@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: dcdba3460dd7 - main - Updates 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: dcdba3460dd779a0180ec7769ab8cd47c932799e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664801615; 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=t63PkM+a5PPxKfVdxr7Pmnl/f+FP3HQ2pmqW6cOxfL0=; b=ULkg5nxB8wRM7U6Pi8NYxwwwgikFWdIrGxlQGifmHlJXCIzT0SwXMzt+Q08DP9akPaxeU3 jmC3f89xCWy0rACe8EOJnRu0Wbse98yMzl4o1CBEoYweQX+Jzl5y8de37ErJ6DIoKHm+eR y/aoo0NkeK9/LdCa0qguB2KMI3Wx1oKZr6u1dLaerDaKTaJheikE7vAQ9Lw/jrj7HOad4i +FDrMoU8Qxp9gDQhiLe5AZpg55EIxSPyt8VO5mgiFwxbbhmHQDWU8FdZAHd5HsagMie8UR vV38TdCOY3V7eXUKoPXeZQ9PVf2jskpbeABoJ4ZAzLW3PY+bmwUukU5HWkTa7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664801615; a=rsa-sha256; cv=none; b=cHgtDuSWoI2zhHOfBAwTEv7S3MwLSA4/Hjg06vKcmBjocu4mPl09xEXUhDshrvMaQdHqg/ pMdrazpDqaFS2BMwE3M24+rFhAiJ8Qa4jKjgHSvhPDvvRKfnW6/pG59AVP04YtjHFojYBd nZ1DOzSS8WreSXXeiDcruT6N9WOc6JAYfbkATYvLUg01UuDHFxFfob961U7nQoXIaBUWr7 2nbDNClgS+8XeFiMnmxRK96NBs1aanX9ib7ljubukxpuca1TBaBPITWR2nXnLoGuZJU9r5 LSuq64MAxBmIG2ndgBiQ+NFvUotTlZcsBHcAwppelsdjsrsrpfLXZGwH0faOlw== 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=dcdba3460dd779a0180ec7769ab8cd47c932799e commit dcdba3460dd779a0180ec7769ab8cd47c932799e Author: Kirk McKusick AuthorDate: 2022-10-03 12:52:17 +0000 Commit: Kirk McKusick CommitDate: 2022-10-03 12:53:10 +0000 Updates to UFS/FFS superblock integrity checks when reading a superblock. Further updates based on ways Peter Holm found to corrupt UFS superblocks in ways that could cause kernel hangs or crashes. No legitimate superblocks should fail as a result of these changes. Reported by: Peter Holm Tested by: Peter Holm Sponsored by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 4ffe0412ff69..e804dfa3d330 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -407,7 +407,7 @@ validate_sblock(struct fs *fs, int flags) FCHK(powerof2(fs->fs_fsize), ==, 0, %jd); FCHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd); FCHK(fs->fs_sbsize, <, (signed)sizeof(struct fs), %jd); - FCHK(fs->fs_sbsize % fs->fs_fsize, !=, 0, %jd); + FCHK(fs->fs_sbsize % dbtob(1), !=, 0, %jd); FCHK(fs->fs_fpg, <, 3 * fs->fs_frag, %jd); FCHK(fs->fs_ncg, <, 1, %jd); FCHK(fs->fs_fsbtodb, !=, ILOG2(fs->fs_fsize / sectorsize), %jd); @@ -503,7 +503,7 @@ validate_sblock(struct fs *fs, int flags) */ if (error) return (error); - FCHK(fs->fs_sbsize % fs->fs_fsize, !=, 0, %jd); + FCHK(fs->fs_sbsize % dbtob(1), !=, 0, %jd); FCHK(fs->fs_ipg % fs->fs_inopb, !=, 0, %jd); FCHK(fs->fs_sblkno, !=, roundup( howmany(fs->fs_sblockloc + SBLOCKSIZE, fs->fs_fsize),