From: "Steven J. Magnani" <steve.magnani@digidescorp.com>
To: Jan Kara <jack@suse.com>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
"Pali Rohár" <pali.rohar@gmail.com>,
"Steven J . Magnani" <steve@digidescorp.com>
Subject: [PATCH v2 2/2] udf: support 2048-byte spacing of VRS descriptors on 4K media
Date: Thu, 11 Jul 2019 08:38:52 -0500 [thread overview]
Message-ID: <20190711133852.16887-2-steve@digidescorp.com> (raw)
In-Reply-To: <20190711133852.16887-1-steve@digidescorp.com>
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.
Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
--- a/fs/udf/super.c 2019-07-10 20:55:33.334359446 -0500
+++ b/fs/udf/super.c 2019-07-10 21:20:58.138382326 -0500
@@ -741,6 +741,7 @@ static int udf_check_vsd(struct super_bl
int 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_bl
if (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;
next prev parent reply other threads:[~2019-07-11 13:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 13:38 [PATCH v2 1/2] udf: refactor VRS descriptor identification Steven J. Magnani
2019-07-11 13:38 ` Steven J. Magnani [this message]
2019-07-11 15:04 ` [PATCH v2 2/2] udf: support 2048-byte spacing of VRS descriptors on 4K media Jan Kara
2019-07-11 15:56 ` Steve Magnani
2019-07-12 9:34 ` Jan Kara
2019-07-11 18:15 ` [PATCH v2 1/2] udf: refactor VRS descriptor identification Pali Rohár
2019-07-12 9:35 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190711133852.16887-2-steve@digidescorp.com \
--to=steve.magnani@digidescorp.com \
--cc=jack@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=steve@digidescorp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).