From 4c837d4ffe43c5378da683b8fc63e17eb3afcf46 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Fri, 25 May 2018 17:52:31 +0200 Subject: libblkid: udf: Fix reporting UDF 2.60 revision According to the UDF 2.60 specification, the Minimum UDF Read Revision value shall be at most #0250 for all media with a UDF 2.60 file system. So in this case use Minimum UDF Write Revision as ID_FS_VERSION to distinguish between UDF 2.50 and UDF 2.60 discs. This commit also adds a testing Blu-Ray Recordable image with UDF revision 2.60 created by Nero which really sets Minimum UDF Read Revision to 2.50. Signed-off-by: Pali Rohár --- libblkid/src/superblocks/udf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libblkid') diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c index bd8e0a5c2..97e79dab0 100644 --- a/libblkid/src/superblocks/udf.c +++ b/libblkid/src/superblocks/udf.c @@ -446,6 +446,16 @@ real_blksz: lvidiu_udf_rev = le16_to_cpu(lvidiu->min_udf_read_rev); if (lvidiu_udf_rev) udf_rev = lvidiu_udf_rev; + /* UDF-2.60: 2. Basic Restrictions & Requirements: + * The Minimum UDF Read Revision value shall be at most #0250 + * for all media with a UDF 2.60 file system. + * So in this case use Minimum UDF Write Revision as ID_FS_VERSION + * to distinguish between UDF 2.50 and UDF 2.60 discs. */ + if (lvidiu_udf_rev == 0x250) { + lvidiu_udf_rev = le16_to_cpu(lvidiu->min_udf_write_rev); + if (lvidiu_udf_rev > 0x250) + udf_rev = lvidiu_udf_rev; + } } } -- cgit v1.2.3-55-g7522