Merge lp:~jtrigg/ubuntu/raring/util-linux/bug-1164683 into lp:ubuntu/raring/util-linux

[Jim Trigg]

Fix bug #1164683 - udf superblock is not parsed correctly by libblkid1 when blocksize < 2048.

Test:
Install udftools and create udf file system with volume id and blocksize < 2048: "sudo mkudffs -b 512 --vid=space /dev/sdb1"
Run blkid on device: "sudo blkid /dev/sdb1"
Without patch, output will be 'TYPE="udf"'. With patch, output will be 'TYPE="udf" LABEL="space"'.
Add /dev/sdb1 to /etc/fstab. Without patch, file system will fail to mount at boot; with patch, file system will mount at boot.
Add LABEL=space to /etc/fstab. Without patch, file system will fail to mount; with patch, file system will mount.

[Iain Lane (laney)]

Are you seeking to update raring as a stable release update with this patch?

If so, please could you edit the bug with the information requested in https://wiki.ubuntu.com/StableReleaseUpdates#Procedure ?

If not, you can set the status at the top to rejected or similar and it'll fall off the sponsoring queue[0]?

Thanks for your help!

[0] http://reqorts.qa.ubuntu.com/reports/sponsoring/

[Dimitri John Ledkov (xnox)]

Uploaded into raring, pending approval for publishing in raring-proposed.

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2011-12-16 22:53:42 +0000
+++ AUTHORS	2013-04-04 20:35:26 +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	2013-02-04 15:40:51 +0000
+++ debian/changelog	2013-04-04 20:35:26 +0000
@@ -1,3 +1,9 @@
+util-linux (2.20.1-5.1ubuntu9) UNRELEASED; urgency=low
+
+  * Apply upstream patch for udf bug when blocksize < 2048 (LP: #1164683)
+
+ -- Jim Trigg (jktrigg) <[e-mail]>  Thu, 04 Apr 2013 15:42:05 -0400
+
 util-linux (2.20.1-5.1ubuntu8) raring; urgency=low
 
   * Cherry pick upstream support for resizepart and the
 
=== modified file 'libblkid/src/superblocks/udf.c'
--- libblkid/src/superblocks/udf.c	2011-11-03 15:38:23 +0000
+++ libblkid/src/superblocks/udf.c	2013-04-04 20:35:26 +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);