From 3e40d2cc61a00a7d69e99b0fda4040cd1df04c57 Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Sun, 31 Jul 2022 07:48:59 -0700 Subject: [PATCH] Fix for 548045b a too aggressive UFS superblock integrity check. Reported by: Jenkins --- 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 611f1989e8f..90e7034e65a 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -415,7 +415,7 @@ validate_sblock(struct fs *fs, int flags) CHK(fs->fs_ipg * fs->fs_ncg, >, (((int64_t)(1)) << 32) - INOPB(fs), %jd); CHK(fs->fs_sblockloc, <, 0, %jd); - CHK(fs->fs_sblockloc, >, fs->fs_fpg, %jd); + CHK(fs->fs_sblockloc, >, dbtob(fs->fs_fpg), %jd); CHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd); CHK(fs->fs_maxbsize, <, fs->fs_bsize, %jd); CHK(powerof2(fs->fs_maxbsize), ==, 0, %jd);