exfat: fix valid_size extension over a shared writable mapping
Namjae Jeon
maintainerPATCH 1/1 exfat: fix valid_size extension over a shared writable mapping
When a shared writable mapping has its valid_size extended by a buffered write or a page fault, exfat zeroes the page-cache gap below the new valid_size. A store through the mapping can race with this zeroing and be overwritten.
Fix this by zeroing the gap lazily. Drop ->map_pages so that every first write fault goes through exfat_page_mkwrite(), which advances valid_size to cover the faulting page. With fault-around enabled, a store could install a writable PTE, skip ->page_mkwrite(), and land past valid_size without advancing it. Extending valid_size one faulting page at a time also leaves never-written pages in a large mapping alone.
The gap is filled with block granularity, zeroing only the not-uptodate blocks and preserving blocks that may hold data stored through the mapping. On the buffered-write path the invalidate lock is held and the gap is unmapped before zeroing, so a racing store re-faults and, under the inode lock, completes only after the gap has been zeroed and valid_size covers it.
--- fs/exfat/exfat_fs.h | 2 +- fs/exfat/file.c | 180 +++++++++++++++++++++++++++++++++++--------- fs/exfat/iomap.c | 11 ++- 3 files changed, 153 insertions(+), 40 deletions(-)
fs/exfat/exfat_fs.h +1 -1
@@ -294,7 +294,7 @@ struct exfat_inode_info {/* on-disk position of directory entry or 0 */ loff_t i_pos;loff_t valid_size; -/* page-aligned size that has been zeroed out for mmap */ +/* block-aligned size zeroed in the page cache (>= valid_size) */ loff_t zeroed_size;/* hash by i_location */ struct hlist_node i_hash_fat;
fs/exfat/file.c +143 -37
247 lines not on this page · raw message
fs/exfat/iomap.c +9 -2
@@ -175,11 +175,18 @@ static int exfat_write_iomap_end(struct inode *inode, loff_t pos, loff_t length,if (ei->valid_size < end) { ei->valid_size = end; -if (ei->zeroed_size < end) - ei->zeroed_size = end; dirtied = true; } +/* +* IOMAP_F_ZERO_TAIL zeroes the remainder of the last block. Track that +* block as zeroed so later valid_size extensions do not zero it again. +*/ +if (iomap->flags &IOMAP_F_ZERO_TAIL ) + end =round_up (end,i_blocksize (inode)); +if (ei->zeroed_size < end) + ei->zeroed_size = end; +if (dirtied || iomap->flags &IOMAP_F_SIZE_CHANGED )mark_inode_dirty (inode);
Signature · 1 line
2.25.1