Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't check fs_bsize before the superblock has been swapped if needed. 

Check value of sbsize before allocating memory with this value.
This commit is contained in:
bouyer 1999-03-05 12:02:18 +00:00
parent 90218b7032
commit 00d7241e81
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.48 1999/02/26 23:44:49 wrstuden Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.49 1999/03/05 12:02:18 bouyer Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -519,7 +519,7 @@ ffs_mountfs(devvp, mp, p)
error = EINVAL;
goto out;
}
if (fs->fs_bsize > MAXBSIZE || fs->fs_bsize < sizeof(struct fs)) {
if (sbsize > MAXBSIZE || sbsize < sizeof(struct fs)) {
error = EINVAL;
goto out;
}
@ -530,7 +530,10 @@ ffs_mountfs(devvp, mp, p)
if (needswap)
ffs_sb_swap((struct fs*)bp->b_data, fs, 0);
#endif
if (fs->fs_bsize > MAXBSIZE || fs->fs_bsize < sizeof(struct fs)) {
error = EINVAL;
goto out;
}
/* make sure cylinder group summary area is a reasonable size. */
if (fs->fs_cgsize == 0 || fs->fs_cpg == 0 ||
fs->fs_ncg > fs->fs_ncyl / fs->fs_cpg + 1 ||