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

Check lp->d_npartitions before calling dkcksum()

Browse Source 
(which is in src/sbin/disklabel/dkcksum.c) because
it doesn't check range and could cause coredump during
installboot against floppy that includes garbage in LABELSECTOR.
This commit is contained in:
tsutsui 2012-10-14 16:20:04 +00:00
parent 697a2ce91b
commit eaa9cbdf28
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/x68k/stand/installboot/installboot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: installboot.c,v 1.5 2006/09/23 20:10:14 pavel Exp $ */
/* $NetBSD: installboot.c,v 1.6 2012/10/14 16:20:04 tsutsui Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@ -159,7 +159,8 @@ checkparttype(const char *name, int force)
lp = (struct disklabel *) &bootblock[LABELBYTEOFFSET];
memcpy(&label, lp, sizeof(struct disklabel));
if (dkcksum(lp) != 0)
if (lp->d_npartitions > MAXPARTITIONS ||
dkcksum(lp) != 0)
/* there is no valid label */
memset(&label, 0, sizeof(struct disklabel));
}