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

adosfs_mountfs(): check for zero amp->secsperblk before dividing by it (which

Browse Source 
would cause trap and panic); it might be invalid if the mounted filesystem is
not actually adosfs.
This fixes kern/11335 by Petri Koistinen.
This commit is contained in:
jdolecek 2000-11-08 08:06:24 +00:00
parent bfef63a365
commit 458d7b0e00
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/adosfs/advfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: advfsops.c,v 1.42 2000/03/16 18:08:21 jdolecek Exp $ */
/* $NetBSD: advfsops.c,v 1.43 2000/11/08 08:06:24 jdolecek Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -211,8 +211,12 @@ adosfs_mountfs(devvp, mp, p)
amp->bsize = parp->p_fsize * parp->p_frag;
amp->secsperblk = parp->p_frag;
}
amp->rootb = (parp->p_size / amp->secsperblk - 1 + parp->p_cpg) >> 1;
amp->numblks = parp->p_size / amp->secsperblk - parp->p_cpg;
/* invalid fs ? */
if (amp->secsperblk == 0) {
error = EINVAL;
goto fail;
}
bp = NULL;
if ((error = bread(devvp, (daddr_t)BBOFF,
@ -223,11 +227,15 @@ adosfs_mountfs(devvp, mp, p)
amp->dostype = adoswordn(bp, 0);
brelse(bp);
/* basic sanity checks */
if (amp->dostype < 0x444f5300 || amp->dostype > 0x444f5305) {
error = EINVAL;
goto fail;
}
amp->rootb = (parp->p_size / amp->secsperblk - 1 + parp->p_cpg) >> 1;
amp->numblks = parp->p_size / amp->secsperblk - parp->p_cpg;
amp->nwords = amp->bsize >> 2;
amp->dbsize = amp->bsize - (IS_FFS(amp) ? 0 : OFS_DATA_OFFSET);
amp->devvp = devvp;