Merge lp:~pali/ubuntu/precise/util-linux/bug-1164683 into lp:ubuntu/precise/util-linux

[Pali]

Correctly read udf label with blocksize < 2048 (LP: #1164683)

[Marc Deslauriers (mdeslaur)]

Looks good. ACK. Uploaded for processing by the SRU team. Thanks!

review: Approve

Unmerged revisions

89. By Pali on 2014-05-28

Correctly read udf label with blocksize < 2048 (LP: #1164683)

=== modified file 'AUTHORS'
--- AUTHORS	2011-12-16 22:53:42 +0000
+++ AUTHORS	2014-05-28 13:11:43 +0000
@@ -282,4 +282,5 @@
       Yann Droneaud <[e-mail]>
       Yoshihiro Takahashi <[e-mail]>
       Yu Zhiguo <[e-mail]>
+      Zachary Catlin <[e-mail]>
       Zdenek Behan <[e-mail]>

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-30 04:22:22 +0000
+++ debian/changelog	2014-05-28 13:11:43 +0000
@@ -1,3 +1,9 @@
+util-linux (2.20.1-1ubuntu3.1) precise; urgency=low
+
+  * Correctly read udf label with blocksize < 2048 (LP: #1164683)
+
+ -- Pali Rohár <[e-mail]>  Wed, 28 May 2014 15:06:34 +0200
+
 util-linux (2.20.1-1ubuntu3) precise; urgency=low
 
   * Build-depend on gettext:any for cross-building support.

=== modified file 'libblkid/src/superblocks/udf.c'
--- libblkid/src/superblocks/udf.c	2011-11-03 15:38:23 +0000
+++ libblkid/src/superblocks/udf.c	2014-05-28 13:11:43 +0000
@@ -63,17 +63,25 @@
 	struct volume_descriptor *vd;
 	struct volume_structure_descriptor *vsd;
 	unsigned int bs;
+	unsigned int pbs[2];
 	unsigned int b;
 	unsigned int type;
 	unsigned int count;
 	unsigned int loc;
-
-	/* search Volume Sequence Descriptor (VSD) to get the logical
-	 * block size of the volume */
-	for (bs = 0x800; bs < 0x8000; bs += 0x800) {
+	unsigned int i;
+
+	/* The block size of a UDF filesystem is that of the underlying
+	 * storage; we check later on for the special case of image files,
+	 * which may have the 2048-byte block size of optical media. */
+	pbs[0] = blkid_probe_get_sectorsize(pr);
+	pbs[1] = 0x800;
+
+	/* check for a Volume Structure Descriptor (VSD); each is
+	 * 2048 bytes long */
+	for (b = 0; b < 0x8000; b += 0x800) {
 		vsd = (struct volume_structure_descriptor *)
 			blkid_probe_get_buffer(pr,
-					UDF_VSD_OFFSET + bs,
+					UDF_VSD_OFFSET + b,
 					sizeof(*vsd));
 		if (!vsd)
 			return 1;
@@ -87,7 +95,7 @@
 	for (b = 0; b < 64; b++) {
 		vsd = (struct volume_structure_descriptor *)
 			blkid_probe_get_buffer(pr,
-					UDF_VSD_OFFSET + ((blkid_loff_t) b * bs),
+					UDF_VSD_OFFSET + ((blkid_loff_t) b * 0x800),
 					sizeof(*vsd));
 		if (!vsd)
 			return -1;
@@ -101,17 +109,24 @@
 	return -1;
 
 anchor:
-	/* read Anchor Volume Descriptor (AVDP) */
-	vd = (struct volume_descriptor *)
-		blkid_probe_get_buffer(pr, 256 * bs, sizeof(*vd));
-	if (!vd)
-		return -1;
-
-	type = le16_to_cpu(vd->tag.id);
-	if (type != 2) /* TAG_ID_AVDP */
-		return 0;
-
-	/* get desriptor list address and block count */
+	/* read Anchor Volume Descriptor (AVDP), checking block size */
+	for (i = 0; i < 2; i++) {
+		vd = (struct volume_descriptor *)
+			blkid_probe_get_buffer(pr, 256 * pbs[i], sizeof(*vd));
+		if (!vd)
+			return -1;
+
+		type = le16_to_cpu(vd->tag.id);
+		if (type == 2) /* TAG_ID_AVDP */
+			goto real_blksz;
+	}
+	return 0;
+
+real_blksz:
+	/* Use the actual block size from here on out */
+	bs = pbs[i];
+
+	/* get descriptor list address and block count */
 	count = le32_to_cpu(vd->type.anchor.length) / bs;
 	loc = le32_to_cpu(vd->type.anchor.location);