summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-03-19 01:21:58 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-03-19 01:21:58 +0000
commit842f6b57877653ef9057179572c41877ebffa69d (patch)
tree18b35ffc4e4e4a1b409da7f889dac77267657822 /sys/kern
parent1e5e4d6acabb1e9c212ac5013ee3cc3c1b43f7ba (diff)
Repair spoofing. We want to start at 'i', not 'j'.
Spotted by deraadt@.
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/subr_disk.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index b9bc9a91d83..9692ad43993 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.116 2011/03/17 21:44:10 krw Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.117 2011/03/19 01:21:57 krw Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -482,17 +482,14 @@ donot:
switch (dp2->dp_typ) {
case DOSPTYP_UNUSED:
fstype = FS_UNUSED;
- n++;
break;
case DOSPTYP_LINUX:
fstype = FS_EXT2FS;
- n++;
break;
case DOSPTYP_NTFS:
fstype = FS_NTFS;
- n++;
break;
case DOSPTYP_FAT12:
@@ -502,7 +499,6 @@ donot:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
fstype = FS_MSDOS;
- n++;
break;
case DOSPTYP_EXTEND:
case DOSPTYP_EXTENDL:
@@ -516,7 +512,6 @@ donot:
break;
default:
fstype = FS_OTHER;
- n++;
break;
}
@@ -532,6 +527,7 @@ donot:
continue;
pp = &lp->d_partitions[8+n];
+ n++;
pp->p_fstype = fstype;
if (letoh32(dp2->dp_start))
DL_SETPOFFSET(pp,