git: 3e40d2cc61a0 - main - Fix for 548045b a too aggressive UFS superblock integrity check.

From: Kirk McKusick <mckusick_at_FreeBSD.org>
Date: Sun, 31 Jul 2022 14:50:11 UTC
The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=3e40d2cc61a00a7d69e99b0fda4040cd1df04c57

commit 3e40d2cc61a00a7d69e99b0fda4040cd1df04c57
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-07-31 14:48:59 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2022-07-31 14:49:50 +0000

    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 611f1989e8f9..90e7034e65a5 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);