From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 Feb 2013 12:56:34 +0000 (+0100)
Subject: libblkid: read whole buffer for iso_volume_descriptor
X-Git-Tag: v2.23-rc1~219
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4127f053ba482b0bd4d6976d4ca90bf77e827461;p=thirdparty%2Futil-linux.git

libblkid: read whole buffer for iso_volume_descriptor

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index c553012dec..148587b3b0 100644
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -204,7 +204,8 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
 		struct boot_record *boot= (struct boot_record *)
 			blkid_probe_get_buffer(pr,
 					off,
-					sizeof(struct boot_record));
+					max(sizeof(struct boot_record),
+					    sizeof(struct iso_volume_descriptor)));
 
 		if (boot == NULL || boot->vd_type == ISO_VD_END)
 			break;
@@ -225,7 +226,7 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
 		if (iso->vd_type != ISO_VD_SUPPLEMENTARY) {
 			off += ISO_SECTOR_SIZE;
 			continue;
-      }
+		}
 
 		if (memcmp(iso->escape_sequences, "%/@", 3) == 0 ||
 		    memcmp(iso->escape_sequences, "%/C", 3) == 0 ||