udf: refactor VRS descriptor identification
Subsystems (2)
PATCH 1/2 udf: refactor VRS descriptor identification
Extract code that parses a Volume Recognition Sequence descriptor (component), in preparation for calling it twice against different locations in a block.
fs/udf/super.c +64 -62
@@ -685,16 +685,62 @@ out_unlock:return error; } -/* Check Volume Structure Descriptors (ECMA 167 2/9.1) */ -/* We also check any "CD-ROM Volume Descriptor Set" (ECMA 167 2/8.3.1) */ -static loff_t udf_check_vsd (struct super_block *sb) +static int identify_vsd (const struct volStructDesc *vsd) +{ +int vsd_id =0 ; + +if (!strncmp (vsd->stdIdent,VSD_STD_ID_CD001 ,VSD_STD_ID_LEN )) { +switch (vsd->structType) { +case 0 : +udf_debug ("ISO9660 Boot Record found\n" ); +break ; +case 1 : +udf_debug ("ISO9660 Primary Volume Descriptor found\n" ); +break ; +case 2 : +udf_debug ("ISO9660 Supplementary Volume Descriptor found\n" ); +break ; +case 3 : +udf_debug ("ISO9660 Volume Partition Descriptor found\n" ); +break ; +case 255 : +udf_debug ("ISO9660 Volume Descriptor Set Terminator found\n" ); +break ; +default : +udf_debug ("ISO9660 VRS (%u) found\n" , vsd->structType); +break ; + } + }else if (!strncmp (vsd->stdIdent,VSD_STD_ID_BEA01 ,VSD_STD_ID_LEN )) + vsd_id =1 ; +else if (!strncmp (vsd->stdIdent,VSD_STD_ID_NSR02 ,VSD_STD_ID_LEN )) + vsd_id =2 ; +else if (!strncmp (vsd->stdIdent,VSD_STD_ID_NSR03 ,VSD_STD_ID_LEN )) + vsd_id =3 ; +else if (!strncmp (vsd->stdIdent,VSD_STD_ID_BOOT2 ,VSD_STD_ID_LEN )) + ;/* vsd_id = 0 */ +else if (!strncmp (vsd->stdIdent,VSD_STD_ID_CDW02 ,VSD_STD_ID_LEN )) + ;/* vsd_id = 0 */ +else { +/* TEA01 or invalid id : end of volume recognition area */ + vsd_id =255 ; + } + +return vsd_id; +} + +/* +* Check Volume Structure Descriptors (ECMA 167 2/9.1) +* We also check any "CD-ROM Volume Descriptor Set" (ECMA 167 2/8.3.1) +* @return 2 if NSR02 found, 3 if NSR03 found, +* -1 if first sector read error, 0 otherwise +*/ +static int udf_check_vsd (struct super_block *sb) {struct volStructDesc *vsd =NULL ;loff_t sector =VSD_FIRST_SECTOR_OFFSET ;int sectorsize;struct buffer_head *bh =NULL ; -int nsr02 =0 ; -int nsr03 =0 ; +int nsr =0 ;struct udf_sb_info *sbi; sbi =UDF_SB (sb);
@@ -718,71 +764,27 @@ static loff_t udf_check_vsd(struct super* activity. This actually happened with uninitialised SSD partitions * (all 0xFF) before the check for the limit and all valid IDs were * added */ -for (; !nsr02 && !nsr03 && sector <VSD_MAX_SECTOR_OFFSET ; +for (; (nsr <2 ) && sector <VSD_MAX_SECTOR_OFFSET ; sector += sectorsize) { +int vsd_id; +/* Read a block */ bh =udf_tread (sb, sector >> sb->s_blocksize_bits);if (!bh)break ; -/* Look for ISO descriptors */ vsd = (struct volStructDesc *)(bh->b_data + (sector & (sb->s_blocksize -1 ))); -if (!strncmp (vsd->stdIdent,VSD_STD_ID_CD001 , -VSD_STD_ID_LEN )) { -switch (vsd->structType) { -case 0 : -udf_debug ("ISO9660 Boot Record found\n" ); -break ; -case 1 : -udf_debug ("ISO9660 Primary Volume Descriptor found\n" ); -break ; -case 2 : -udf_debug ("ISO9660 Supplementary Volume Descriptor found\n" ); -break ; -case 3 : -udf_debug ("ISO9660 Volume Partition Descriptor found\n" ); -break ; -case 255 : -udf_debug ("ISO9660 Volume Descriptor Set Terminator found\n" ); -break ; -default : -udf_debug ("ISO9660 VRS (%u) found\n" , - vsd->structType); -break ; - } - }else if (!strncmp (vsd->stdIdent,VSD_STD_ID_BEA01 , -VSD_STD_ID_LEN )) - ;/* nothing */ -else if (!strncmp (vsd->stdIdent,VSD_STD_ID_TEA01 , -VSD_STD_ID_LEN )) { -brelse (bh); -break ; - }else if (!strncmp (vsd->stdIdent,VSD_STD_ID_NSR02 , -VSD_STD_ID_LEN )) - nsr02 = sector; -else if (!strncmp (vsd->stdIdent,VSD_STD_ID_NSR03 , -VSD_STD_ID_LEN )) - nsr03 = sector; -else if (!strncmp (vsd->stdIdent,VSD_STD_ID_BOOT2 , -VSD_STD_ID_LEN )) - ;/* nothing */ -else if (!strncmp (vsd->stdIdent,VSD_STD_ID_CDW02 , -VSD_STD_ID_LEN )) - ;/* nothing */ -else { -/* invalid id : end of volume recognition area */ -brelse (bh); -break ; - } + vsd_id =identify_vsd (vsd); +if (vsd_id > nsr) + nsr = vsd_id; +brelse (bh); } -if (nsr03) -return nsr03; -else if (nsr02) -return nsr02; +if ((nsr >=2 ) && (nsr <=3 )) +return nsr;else if (!bh && sector - (sbi->s_session << sb->s_blocksize_bits) ==VSD_FIRST_SECTOR_OFFSET )return -1 ;
@@ -1936,7 +1938,7 @@ static int udf_load_vrs(struct super_blo int silent, struct kernel_lb_addr *fileset) { struct udf_sb_info *sbi = UDF_SB(sb); -loff_t nsr_off; +int nsr =0 ;int ret;if (!sb_set_blocksize (sb, uopt->blocksize)) {
@@ -1947,13 +1949,13 @@ static int udf_load_vrs(struct super_blo sbi->s_last_block = uopt->lastblock;if (!uopt->novrs) {/* Check that it is NSR02 compliant */ - nsr_off =udf_check_vsd (sb); -if (!nsr_off) { + nsr =udf_check_vsd (sb); +if (!nsr) {if (!silent)udf_warn (sb,"No VRS found\n" );return -EINVAL ; } -if (nsr_off ==-1 ) +if (nsr ==255 )udf_debug ("Failed to read sector at offset %d. " "Assuming open disc. Skipping validity " "check\n" ,VSD_FIRST_SECTOR_OFFSET );
PATCH 2/2 udf: support 2048-byte spacing of VRS descriptors on 4K media
Some UDF creators (specifically Microsoft, but perhaps others) mishandle the ECMA-167 corner case that requires descriptors within a Volume Recognition Sequence to be placed at 4096-byte intervals on media where the block size is 4K. Instead, the descriptors are placed at the 2048- byte interval mandated for media with smaller blocks. This nonconformity currently prevents Linux from recognizing the filesystem as UDF.
Modify the driver to tolerate a misformatted VRS on 4K media.
fs/udf/super.c +17 -0
@@ -741,6 +741,7 @@ static int udf_check_vsd(struct super_blint sectorsize;struct buffer_head *bh =NULL ;int nsr =0 ; +int quirk_nsr =0 ;struct udf_sb_info *sbi; sbi =UDF_SB (sb);
@@ -780,11 +781,27 @@ static int udf_check_vsd(struct super_blif (vsd_id > nsr) nsr = vsd_id; +/* Special handling for improperly formatted VRS (e.g., Win10) +* where components are separated by 2048 bytes +* even though sectors are 4K +*/ +if ((sb->s_blocksize ==4096 ) && (quirk_nsr <2 )) { + vsd_id =identify_vsd (vsd +1 ); +if ((nsr ==1 ) || (quirk_nsr ==1 )) { +/* BEA01 has been seen, allow quirk NSR */ +if (vsd_id > quirk_nsr) + quirk_nsr = vsd_id; + }else if (vsd_id >3 ) + quirk_nsr = vsd_id;/* 0 -> 255 */ + } +brelse (bh); }if ((nsr >=2 ) && (nsr <=3 ))return nsr; +else if ((quirk_nsr >=2 ) && (quirk_nsr <=3 )) +return quirk_nsr;else if (!bh && sector - (sbi->s_session << sb->s_blocksize_bits) ==VSD_FIRST_SECTOR_OFFSET )return -1 ;