KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updates to UFS/FFS superblock integrity checks when reading a superblock.

Browse Source 
Further updates adding casts to avoid 32-bit multiplication overflow
inspired by fixes in commit 017367c114.

No legitimate superblocks should fail as a result of these changes.

Sponsored by: The FreeBSD Foundation
This commit is contained in:
Kirk McKusick
2022-11-17 14:50:27 -08:00
parent 4a0db5e292
commit 8435a9b206
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/ufs/ffs/ffs_subr.c
+6 -4
View File
@@ -473,13 +473,15 @@ validate_sblock(struct fs *fs, int flags)
FCHK(fs->fs_fpg, <, 3 * fs->fs_frag, %jd);
FCHK(fs->fs_ncg, <, 1, %jd);
FCHK(fs->fs_ipg, <, fs->fs_inopb, %jd);
FCHK(fs->fs_ipg * fs->fs_ncg, >, (((int64_t)(1)) << 32) - INOPB(fs),
%jd);
FCHK((u_int64_t)fs->fs_ipg * fs->fs_ncg, >,
(((int64_t)(1)) << 32) - INOPB(fs), %jd);
FCHK(fs->fs_cstotal.cs_nifree, <, 0, %jd);
FCHK(fs->fs_cstotal.cs_nifree, >, fs->fs_ipg * fs->fs_ncg, %jd);
FCHK(fs->fs_cstotal.cs_nifree, >, (u_int64_t)fs->fs_ipg * fs->fs_ncg,
%jd);
FCHK(fs->fs_cstotal.cs_ndir, <, 0, %jd);
FCHK(fs->fs_cstotal.cs_ndir, >,
(fs->fs_ipg * fs->fs_ncg) - fs->fs_cstotal.cs_nifree, %jd);
((u_int64_t)fs->fs_ipg * fs->fs_ncg) - fs->fs_cstotal.cs_nifree,
%jd);
FCHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd);
FCHK(fs->fs_sbsize, <, (signed)sizeof(struct fs), %jd);
FCHK(fs->fs_maxbsize, <, fs->fs_bsize, %jd);