summaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2023-02-28 12:00:25 +0100
committerJan Kara <jack@suse.cz>2023-03-06 16:38:25 +0100
commitcecb1f06541e12ec68805dbddb2013ee720dfe3d (patch)
treed07ffd1b3154d716b14dfe284db0f087a96d2c0f /fs/udf
parent49854d3ccc55efd7e6873e0c39f360bdbe251c51 (diff)
downloadlinux-stable-cecb1f06541e12ec68805dbddb2013ee720dfe3d.tar.gz
linux-stable-cecb1f06541e12ec68805dbddb2013ee720dfe3d.tar.bz2
linux-stable-cecb1f06541e12ec68805dbddb2013ee720dfe3d.zip
udf: Fix reading of in-ICB files
After merging address space operations of normal and in-ICB files, readahead could get called for in-ICB files which resulted in udf_get_block() being called for these files. udf_get_block() is not prepared to be called for in-ICB files and ends up returning garbage results as it interprets file data as extent list. Fix the problem by skipping readahead for in-ICB files. Fixes: 37a8a39f7ad3 ("udf: Switch to single address_space_operations") Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/inode.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index facaf3a20625..0cb7d8fba2c8 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -241,6 +241,15 @@ static int udf_read_folio(struct file *file, struct folio *folio)
static void udf_readahead(struct readahead_control *rac)
{
+ struct udf_inode_info *iinfo = UDF_I(rac->mapping->host);
+
+ /*
+ * No readahead needed for in-ICB files and udf_get_block() would get
+ * confused for such file anyway.
+ */
+ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)
+ return;
+
mpage_readahead(rac, udf_get_block);
}