d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch a couple more null devsw dereferences...

Browse Source
This commit is contained in:
Peter Wemm 1995-12-16 18:52:08 +00:00
parent 15a76dc428
commit c33b06ba4f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=12889
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.49 1995/12/13 15:12:13 julian Exp $
* $Id: autoconf.c,v 1.50 1995/12/14 23:35:17 bde Exp $
*/
/*
@ -281,11 +281,13 @@ setdumpdev(dev)
maj = major(dev);
if (maj >= nblkdev)
return (ENXIO);
if (bdevsw[maj] == NULL)
return (ENXIO); /* XXX is this right? */
if (bdevsw[maj]->d_psize == NULL)
return (ENXIO); /* XXX should sometimes be ENODEV */
return (ENXIO); /* XXX should be ENODEV ? */
psize = bdevsw[maj]->d_psize(dev);
if (psize == -1)
return (ENXIO); /* XXX should sometimes be ENODEV */
return (ENXIO); /* XXX should be ENODEV ? */
newdumplo = psize - Maxmem * NBPG / DEV_BSIZE;
if (newdumplo < 0)
return (ENOSPC);

6
sys/amd64/amd64/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.158 1995/12/13 15:12:23 julian Exp $
* $Id: machdep.c,v 1.159 1995/12/14 14:35:34 peter Exp $
*/
#include "npx.h"
@ -970,6 +970,10 @@ dumpsys()
return;
if ((minor(dumpdev)&07) != 1)
return;
if (!(bdevsw[major(dumpdev)]))
return;
if (!(bdevsw[major(dumpdev)]->d_dump))
return;
dumpsize = Maxmem;
printf("\ndumping to dev %lx, offset %ld\n", dumpdev, dumplo);
printf("dump ");

8
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.49 1995/12/13 15:12:13 julian Exp $
* $Id: autoconf.c,v 1.50 1995/12/14 23:35:17 bde Exp $
*/
/*
@ -281,11 +281,13 @@ setdumpdev(dev)
maj = major(dev);
if (maj >= nblkdev)
return (ENXIO);
if (bdevsw[maj] == NULL)
return (ENXIO); /* XXX is this right? */
if (bdevsw[maj]->d_psize == NULL)
return (ENXIO); /* XXX should sometimes be ENODEV */
return (ENXIO); /* XXX should be ENODEV ? */
psize = bdevsw[maj]->d_psize(dev);
if (psize == -1)
return (ENXIO); /* XXX should sometimes be ENODEV */
return (ENXIO); /* XXX should be ENODEV ? */
newdumplo = psize - Maxmem * NBPG / DEV_BSIZE;
if (newdumplo < 0)
return (ENOSPC);

6
sys/i386/i386/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.158 1995/12/13 15:12:23 julian Exp $
* $Id: machdep.c,v 1.159 1995/12/14 14:35:34 peter Exp $
*/
#include "npx.h"
@ -970,6 +970,10 @@ dumpsys()
return;
if ((minor(dumpdev)&07) != 1)
return;
if (!(bdevsw[major(dumpdev)]))
return;
if (!(bdevsw[major(dumpdev)]->d_dump))
return;
dumpsize = Maxmem;
printf("\ndumping to dev %lx, offset %ld\n", dumpdev, dumplo);
printf("dump ");