Index: ../../sys/boot/efi/libefi/efipart.c
===================================================================
--- ../../sys/boot/efi/libefi/efipart.c	(revision 298593)
+++ ../../sys/boot/efi/libefi/efipart.c	(working copy)
@@ -158,10 +158,12 @@
 		} else
 			hout[nout] = hin[n];
 		nout++;
-		pdinfo[npdinfo].pd_open = 0;
-		pdinfo[npdinfo].pd_bcache = NULL;
-		pdinfo[npdinfo].pd_unit = npdinfo;
-		npdinfo++;
+		if (npdinfo < MAXPDDEV) {
+			pdinfo[npdinfo].pd_open = 0;
+			pdinfo[npdinfo].pd_bcache = NULL;
+			pdinfo[npdinfo].pd_unit = npdinfo;
+			npdinfo++;
+		}
 	}
 
 	bcache_add_dev(npdinfo);