libblkid: udf superblock does not read correctly when blocksize < 2048

diff --git a/AUTHORS b/AUTHORS
index f29f9a3..54fe7ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -385,5 +385,6 @@ CONTRIBUTORS:
       Yoshihiro Takahashi <email address hidden>
       Yuri Chornoivan <email address hidden>
       Yu Zhiguo <email address hidden>
+ Zachary Catlin <email address hidden>
       Zdenek Behan <email address hidden>
       Zhi Li <email address hidden>
diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c
index 2cb471d..c9fb022 100644
--- a/libblkid/src/superblocks/udf.c
+++ b/libblkid/src/superblocks/udf.c
@@ -64,17 +64,25 @@ static int probe_udf(blkid_probe pr,
        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;
+ unsigned int i;

- /* search Volume Sequence Descriptor (VSD) to get the logical
- * block size of the volume */
- for (bs = 0x800; bs < 0x8000; bs += 0x800) {
+ /* 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;
@@ -88,7 +96,7 @@ static int probe_udf(blkid_probe pr,
        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;
@@ -102,17 +110,24 @@ static int probe_udf(blkid_probe pr,
        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;
+ /* 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 t...

Status changed to 'Confirmed' because the bug affects multiple users.

Uploaded patch to saucy, thanks Jim!

This bug was fixed in the package util-linux - 2.20.1-5.1ubuntu9

---------------
util-linux (2.20.1-5.1ubuntu9) saucy; urgency=low

  * Apply upstream patch for udf bug when blocksize < 2048 (LP: #1164683)
 -- Jim Trigg (jktrigg) <email address hidden> Thu, 04 Apr 2013 15:42:05 -0400

Hello Jim, or anyone else affected,

Accepted util-linux into raring-proposed. The package will build now and be available at http://launchpad.net/ubuntu/+source/util-linux/2.20.1-5.1ubuntu8.1 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, and change the tag from verification-needed to verification-done. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed. In either case, details of your testing will help us make a better decision.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance!

Since I provided the fix after testing it, testing it again myself seems rather redundant...

Someone has to test it and you testing it again does verify the patch was applied correctly, the packages built correctly, etc.

The fix for this bug has been awaiting testing feedback in the -proposed repository for raring for more than 90 days. Please test this fix and update the bug appropriately with the results. In the event that the fix for this bug is still not verified 15 days from now, the package will be removed from the -proposed repository.

Can you backport this patch to lts precise release?

@Jim Trigg, @Brian Murray: BUMP, can you backport this patch to lts precise?

Raring is now eol.

@Phillip Susi: Any news for precise?

BUMP!

I applied patch for precise into my branch at https://code.launchpad.net/~pali/ubuntu/precise/util-linux/bug-1164683

The merge request looks good. ACK. Uploaded for processing by the SRU team. Thanks!

@Marc Deslauriers (mdeslaur): When will be package in precise archive?

Hello Jim, or anyone else affected,

Accepted util-linux into precise-proposed. The package will build now and be available at http://launchpad.net/ubuntu/+source/util-linux/2.20.1-1ubuntu3.1 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, and change the tag from verification-needed to verification-done. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed. In either case, details of your testing will help us make a better decision.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance!

Now I tested new version from ubuntu precise proposed repository and it fixing this bug.

UDF filesystem created by mkudffs -b 512 has correct LABEL in blkid output.

This bug was fixed in the package util-linux - 2.20.1-1ubuntu3.1

---------------
util-linux (2.20.1-1ubuntu3.1) precise; urgency=low

  * Correctly read udf label with blocksize < 2048 (LP: #1164683)
 -- Pali Rohar <email address hidden> Wed, 28 May 2014 15:06:34 +0200

The verification of the Stable Release Update for util-linux has completed successfully and the package has now been released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions.