diff options
| author | Pali Rohár | 2017-11-20 18:16:59 +0100 |
|---|---|---|
| committer | Pali Rohár | 2017-11-20 18:16:59 +0100 |
| commit | 3999e62a72f46d525ee4cc10b18781468ace9b9c (patch) | |
| tree | 6c7c73c415f665e5ea10a80968057b5cec0531ec | |
| parent | Merge branch 'master' of https://github.com/pali/util-linux (diff) | |
| download | kernel-qcow2-util-linux-3999e62a72f46d525ee4cc10b18781468ace9b9c.tar.gz kernel-qcow2-util-linux-3999e62a72f46d525ee4cc10b18781468ace9b9c.tar.xz kernel-qcow2-util-linux-3999e62a72f46d525ee4cc10b18781468ace9b9c.zip | |
libblkid: udf: Fix parsing UDF revision
UDF revision is stored as decimal number in hexadecimal format.
E.g. number 0x0150 is revision 1.50, number 0x0201 is revision 2.01.
Apparently all UDF test images have number which has same representation in
decimal and hexadecimal format, so problem was not detected.
This patch adds new test image with UDF revision 1.50. Internally number is
stored as 0x0150. In decimal format it is (incorrectly) 1.80, but in
hexadecimal correct 1.50.
$ dd if=/dev/zero of=udf-hdd-mkudffs-1.3-8.img bs=1M count=10
$ mkudffs -r 0x150 -b 512 udf-hdd-mkudffs-1.3-8.img
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
| -rw-r--r-- | libblkid/src/superblocks/udf.c | 4 | ||||
| -rw-r--r-- | tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 | 10 | ||||
| -rw-r--r-- | tests/ts/blkid/images-fs/udf-hdd-mkudffs-1.3-8.img.xz | bin | 0 -> 2328 bytes |
3 files changed, 13 insertions, 1 deletions
diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c index 756fbcf63..bd8e0a5c2 100644 --- a/libblkid/src/superblocks/udf.c +++ b/libblkid/src/superblocks/udf.c @@ -450,7 +450,9 @@ real_blksz: } if (udf_rev) - blkid_probe_sprintf_version(pr, "%d.%02d", (int)(udf_rev >> 8), (int)(udf_rev & 0xFF)); + /* UDF revision is stored as decimal number in hexadecimal format. + * E.g. number 0x0150 is revision 1.50, number 0x0201 is revision 2.01. */ + blkid_probe_sprintf_version(pr, "%x.%02x", (unsigned int)(udf_rev >> 8), (unsigned int)(udf_rev & 0xFF)); return 0; } diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 new file mode 100644 index 000000000..448c8f90b --- /dev/null +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 @@ -0,0 +1,10 @@ +ID_FS_LABEL=LinuxUDF +ID_FS_LABEL_ENC=LinuxUDF +ID_FS_LOGICAL_VOLUME_ID=LinuxUDF +ID_FS_TYPE=udf +ID_FS_USAGE=filesystem +ID_FS_UUID=5a11940936fe76a8 +ID_FS_UUID_ENC=5a11940936fe76a8 +ID_FS_VERSION=1.50 +ID_FS_VOLUME_ID=LinuxUDF +ID_FS_VOLUME_SET_ID=5a11940936fe76a8LinuxUDF diff --git a/tests/ts/blkid/images-fs/udf-hdd-mkudffs-1.3-8.img.xz b/tests/ts/blkid/images-fs/udf-hdd-mkudffs-1.3-8.img.xz Binary files differnew file mode 100644 index 000000000..b91180cbc --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-hdd-mkudffs-1.3-8.img.xz |