archive/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-08-15 14:11:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

\n

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEq1nRK9aeMoq1VSgcnJ2qBz9kQNkFAmiHny8ACgkQnJ2qBz9k
 QNl/dQf/Wh/wsQwnYbZ1P1Mk1aGq+5xLAZJrt8dY8umHfCklWzjrmrpbxV11KbSX
 sxnAzRRGP/GlP9Atb6J4oBH2odIY57aKZcfeA64FYYM7yDo3ZvNQvNe+Il3Wr5Zn
 UBCGxr6mbeGt1GjBiP77kZzgLeHNnDKBR8Eu9i6zqYBsPk6wBM83oC2g+Ala++vM
 leb+uph2fL0rGqXu07LUpQDeLadBjhqRkzdgKOYJ6OXmckWASpYBkQlnCNTnAPYv
 AvDod+Mh5UNR0Sq+zB/EYEQn6OTFq+IB6MpGypQjVKxACUt3pTlRyraKWpvakR6r
 tih1TyOS5z1wZXBcoU2EtA9N/xYnjw==
 =Kj02
 -----END PGP SIGNATURE-----

Merge tag 'fs_for_v6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull udf and ext2 updates from Jan Kara:
 "A few udf and ext2 fixes and cleanups"

* tag 'fs_for_v6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Verify partition map count
  udf: stop using write_cache_pages
  ext2: Handle fiemap on empty files to prevent EINVAL
This commit is contained in:
Linus Torvalds 2025-07-28 16:16:09 -07:00
commit c7bfaff47a
3 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fs/ext2/inode.c
View file

@ -895,9 +895,19 @@ int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len) u64 start, u64 len)
{ {
int ret; int ret;
loff_t i_size;
inode_lock(inode); inode_lock(inode);
len = min_t(u64, len, i_size_read(inode)); i_size = i_size_read(inode);
/*
* iomap_fiemap() returns EINVAL for 0 length. Make sure we don't trim
* length to 0 but still trim the range as much as possible since
* ext2_get_blocks() iterates unmapped space block by block which is
* slow.
*/
if (i_size == 0)
i_size = 1;
len = min_t(u64, len, i_size);
ret = iomap_fiemap(inode, fieinfo, start, len, &ext2_iomap_ops); ret = iomap_fiemap(inode, fieinfo, start, len, &ext2_iomap_ops);
inode_unlock(inode); inode_unlock(inode);

28
fs/udf/inode.c
View file

@ -181,19 +181,23 @@ static void udf_write_failed(struct address_space *mapping, loff_t to)
} }
} }
static int udf_adinicb_writepage(struct folio *folio, static int udf_adinicb_writepages(struct address_space *mapping,
struct writeback_control *wbc, void *data) struct writeback_control *wbc)
{ {
struct inode *inode = folio->mapping->host; struct inode *inode = mapping->host;
struct udf_inode_info *iinfo = UDF_I(inode); struct udf_inode_info *iinfo = UDF_I(inode);
struct folio *folio = NULL;
int error = 0;
while ((folio = writeback_iter(mapping, wbc, folio, &error))) {
BUG_ON(!folio_test_locked(folio));
BUG_ON(folio->index != 0);
memcpy_from_file_folio(iinfo->i_data + iinfo->i_lenEAttr, folio,
0, i_size_read(inode));
folio_unlock(folio);
}
BUG_ON(!folio_test_locked(folio));
BUG_ON(folio->index != 0);
memcpy_from_file_folio(iinfo->i_data + iinfo->i_lenEAttr, folio, 0,
i_size_read(inode));
folio_unlock(folio);
mark_inode_dirty(inode); mark_inode_dirty(inode);
return 0; return 0;
} }
@ -203,9 +207,9 @@ static int udf_writepages(struct address_space *mapping,
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct udf_inode_info *iinfo = UDF_I(inode); struct udf_inode_info *iinfo = UDF_I(inode);
if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)
return mpage_writepages(mapping, wbc, udf_get_block_wb); return udf_adinicb_writepages(mapping, wbc);
return write_cache_pages(mapping, wbc, udf_adinicb_writepage, NULL); return mpage_writepages(mapping, wbc, udf_get_block_wb);
} }
static void udf_adinicb_read_folio(struct folio *folio) static void udf_adinicb_read_folio(struct folio *folio)

13
fs/udf/super.c
View file

@ -1440,7 +1440,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
struct genericPartitionMap *gpm; struct genericPartitionMap *gpm;
uint16_t ident; uint16_t ident;
struct buffer_head *bh; struct buffer_head *bh;
unsigned int table_len; unsigned int table_len, part_map_count;
int ret; int ret;
bh = udf_read_tagged(sb, block, block, &ident); bh = udf_read_tagged(sb, block, block, &ident);
@ -1461,7 +1461,16 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
"logical volume"); "logical volume");
if (ret) if (ret)
goto out_bh; goto out_bh;
ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
part_map_count = le32_to_cpu(lvd->numPartitionMaps);
if (part_map_count > table_len / sizeof(struct genericPartitionMap1)) {
udf_err(sb, "error loading logical volume descriptor: "
"Too many partition maps (%u > %u)\n", part_map_count,
table_len / (unsigned)sizeof(struct genericPartitionMap1));
ret = -EIO;
goto out_bh;
}
ret = udf_sb_alloc_partition_maps(sb, part_map_count);
if (ret) if (ret)
goto out_bh; goto out_bh;