Skip to content

Commit ad660c3

Browse files
adam900710kdave
authored andcommitted
btrfs: avoid access-byoned-folio for bs > ps encoded writes
[POTENTIAL BUG] If the system page size is 4K and fs block size is 8K, and max_inline mount option is set to 6K, we can inline a 6K sized data extent. Then a encoded write submitted a compressed extent which is at file offset 0, and the compressed length is 6K, which is allowed to be inlined. Now a read beyond page boundary is triggered inside write_extent_buffer() from insert_inline_extent(). [CAUSE] Currently the function __cow_file_range_inline() can only accept a single folio. For regular compressed write path, we always allocate the compressed folios using the minimal order matching the block size, thus the @compressed_folio should always cover a full fs block thus it is fine. But for encoded writes, they allocate page size folios, this means we can hit a case where the compressed data is smaller than block size but still larger than page size, in that case __cow_file_range_inline() will be called with @compressed_size larger than a page. In that case we will trigger a read beyond the folio inside insert_inline_extent(). Thankfully this is not that common, as the default max_inline is only 2048 bytes, smaller than PAGE_SIZE, and bs > ps support is still experimental. [FIX] We need to either allow insert_inline_extent() to accept a page array to properly support such case, or reject such inline extent. The latter is a much simpler solution, and considering bs > ps will stay as a corner case and non-default max_inline will be even rarer, I don't think we really need to fulfill such niche. So just reject any inline extent that's larger than PAGE_SIZE, and add an extra ASSERT() to insert_inline_extent() to catch such beyond-boundary access. Fixes: ec20799 ("btrfs: enable encoded read/write/send for bs > ps cases") Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 7bba293 commit ad660c3

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

fs/btrfs/inode.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,12 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
485485
* The compressed size also needs to be no larger than a sector.
486486
* That's also why we only need one page as the parameter.
487487
*/
488-
if (compressed_folio)
488+
if (compressed_folio) {
489489
ASSERT(compressed_size <= sectorsize);
490-
else
490+
ASSERT(compressed_size <= PAGE_SIZE);
491+
} else {
491492
ASSERT(compressed_size == 0);
493+
}
492494

493495
if (compressed_size && compressed_folio)
494496
cur_size = compressed_size;
@@ -575,6 +577,18 @@ static bool can_cow_file_range_inline(struct btrfs_inode *inode,
575577
if (offset != 0)
576578
return false;
577579

580+
/*
581+
* Even for bs > ps cases, cow_file_range_inline() can only accept a
582+
* single folio.
583+
*
584+
* This can be problematic and cause access beyond page boundary if a
585+
* page sized folio is passed into that function.
586+
* And encoded write is doing exactly that.
587+
* So here limits the inlined extent size to PAGE_SIZE.
588+
*/
589+
if (size > PAGE_SIZE || compressed_size > PAGE_SIZE)
590+
return false;
591+
578592
/* Inline extents are limited to sectorsize. */
579593
if (size > fs_info->sectorsize)
580594
return false;

0 commit comments

Comments
 (0)