X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=lib%2Flibefi%2Frdwr_efi.c;h=0600a9523ebce03f4f37dbd0bb0169dbc59cbf0c;hb=c421831192e4015c300239d862c5b9d47088ecd1;hp=2af0c4e2e472f0122532bfecf5f18e8ba9242598;hpb=b3b4f547f9243c0c1a446c74574a1f737e29dee6;p=zfs.git

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 2af0c4e..0600a95 100644
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -87,7 +87,7 @@ struct dk_map2  default_vtoc_map[NDKMAP] = {
 
 #if defined(_SUNOS_VTOC_16)
 
-#if defined(i386) || defined(__amd64)
+#if defined(i386) || defined(__amd64) || defined(__arm)
 	{	V_BOOT,		V_UNMNT	},		/* i - 8 */
 	{	V_ALTSCTR,	0	},		/* j - 9 */
 
@@ -196,6 +196,12 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
 		rval = sscanf(dev_path, "/dev/%[a-zA-Z0-9]p%hu",
 			      dki_info->dki_dname,
 			      &dki_info->dki_partition);
+	} else if ((strncmp(dev_path, "/dev/vd", 7) == 0)) {
+		strcpy(dki_info->dki_cname, "vd");
+		dki_info->dki_ctype = DKC_MD;
+		rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
+			      dki_info->dki_dname,
+			      &dki_info->dki_partition);
 	} else if ((strncmp(dev_path, "/dev/dm-", 8) == 0)) {
 		strcpy(dki_info->dki_cname, "pseudo");
 		dki_info->dki_ctype = DKC_VBD;
@@ -541,16 +547,22 @@ check_label(int fd, dk_efi_t *dk_ioc)
 	 */
 	crc = efi->efi_gpt_HeaderCRC32;
 	efi->efi_gpt_HeaderCRC32 = 0;
+	len_t headerSize = (len_t)LE_32(efi->efi_gpt_HeaderSize);
+
+	if(headerSize < EFI_MIN_LABEL_SIZE || headerSize > EFI_LABEL_SIZE) {
+		if (efi_debug)
+			(void) fprintf(stderr,
+				"Invalid EFI HeaderSize %llu.  Assuming %d.\n",
+				headerSize, EFI_MIN_LABEL_SIZE);
+	}
 
-	if (((len_t)LE_32(efi->efi_gpt_HeaderSize) > dk_ioc->dki_length) ||
-	    crc != LE_32(efi_crc32((unsigned char *)efi,
-	    LE_32(efi->efi_gpt_HeaderSize)))) {
+	if ((headerSize > dk_ioc->dki_length) ||
+	    crc != LE_32(efi_crc32((unsigned char *)efi, headerSize))) {
 		if (efi_debug)
 			(void) fprintf(stderr,
 			    "Bad EFI CRC: 0x%x != 0x%x\n",
-			    crc,
-			    LE_32(efi_crc32((unsigned char *)efi,
-			    sizeof (struct efi_gpt))));
+			    crc, LE_32(efi_crc32((unsigned char *)efi,
+			    headerSize)));
 		return (VT_EINVAL);
 	}
 
@@ -1152,7 +1164,7 @@ efi_write(int fd, struct dk_gpt *vtoc)
 	/* stuff user's input into EFI struct */
 	efi->efi_gpt_Signature = LE_64(EFI_SIGNATURE);
 	efi->efi_gpt_Revision = LE_32(vtoc->efi_version); /* 0x02000100 */
-	efi->efi_gpt_HeaderSize = LE_32(sizeof (struct efi_gpt));
+	efi->efi_gpt_HeaderSize = LE_32(sizeof (struct efi_gpt) - LEN_EFI_PAD);
 	efi->efi_gpt_Reserved1 = 0;
 	efi->efi_gpt_MyLBA = LE_64(1ULL);
 	efi->efi_gpt_AlternateLBA = LE_64(lba_backup_gpt_hdr);
@@ -1221,7 +1233,8 @@ efi_write(int fd, struct dk_gpt *vtoc)
 	    LE_32(efi_crc32((unsigned char *)efi_parts,
 	    vtoc->efi_nparts * (int)sizeof (struct efi_gpe)));
 	efi->efi_gpt_HeaderCRC32 =
-	    LE_32(efi_crc32((unsigned char *)efi, sizeof (struct efi_gpt)));
+	    LE_32(efi_crc32((unsigned char *)efi,
+	    LE_32(efi->efi_gpt_HeaderSize)));
 
 	if (efi_ioctl(fd, DKIOCSETEFI, &dk_ioc) == -1) {
 		free(dk_ioc.dki_data);
@@ -1274,7 +1287,7 @@ efi_write(int fd, struct dk_gpt *vtoc)
 	efi->efi_gpt_HeaderCRC32 = 0;
 	efi->efi_gpt_HeaderCRC32 =
 	    LE_32(efi_crc32((unsigned char *)dk_ioc.dki_data,
-	    sizeof (struct efi_gpt)));
+	    LE_32(efi->efi_gpt_HeaderSize)));
 
 	if (efi_ioctl(fd, DKIOCSETEFI, &dk_ioc) == -1) {
 		if (efi_debug) {