ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid: udf: add support for unclosed sequential Write-Once media

This commit is contained in:
Pali Rohár 2020-11-08 14:24:06 +01:00
parent 6408acd9e0
commit 8e3c0176bd
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libblkid/src/superblocks/udf.c
View File

@ -276,12 +276,24 @@ anchor:
return errno ? -errno : 1;
/* Check that we read correct sector and detected correct block size */
if (le32_to_cpu(vd->tag.location) != s_off / pbs[i] + 256)
continue;
if (le32_to_cpu(vd->tag.location) == s_off / pbs[i] + 256) {
type = le16_to_cpu(vd->tag.id);
if (type == TAG_ID_AVDP)
goto real_blksz;
}
type = le16_to_cpu(vd->tag.id);
if (type == TAG_ID_AVDP)
goto real_blksz;
/* UDF-2.60: 2.2.3: Unclosed sequential Write-Once media may
* have a single AVDP present at either sector 256 or 512. */
vd = (struct volume_descriptor *)
blkid_probe_get_buffer(pr, s_off + 512 * pbs[i], sizeof(*vd));
if (!vd)
return errno ? -errno : 1;
if (le32_to_cpu(vd->tag.location) == s_off / pbs[i] + 512) {
type = le16_to_cpu(vd->tag.id);
if (type == TAG_ID_AVDP)
goto real_blksz;
}
}
return 1;