ntfs: trim the sizes after a short write
Subsystems (2)
PATCH v5 1/1 ntfs: trim the sizes after a short write
From: Zhan Xusheng <[email protected]>
ntfs_file_write_iter() moves the data size and, for a non-resident uncompressed file, the initialized size to pos + count before the copy. __ntfs_extend_initialized_size() only zeroes [old initialized size, pos), so the range [pos, pos + count) is initialized only by the copy itself. When iomap_file_buffered_write() copies less than count, it returns a positive short count and the error rollback at out: does not run. The file keeps the size pos + count, and [pos + ret, pos + count) reads back whatever the freed clusters held before, also after a remount. A local user can read the old contents of freed clusters this way.
Run the existing rollback for a short write as well, and roll the data size back to the end of what was written. Keep the initialized size, as a page fault through a shared mapping may rely on it while the write is stalled on its source, and zero what the write did not reach, up to the end of the block holding pos + count. Only if that fails, take the initialized size back to where the zeroing started.
---
v5 (Baolin):
- start the zeroing at pos, not at the old initialized size, which overwrote data stored through a shared mapping below pos
- do the same for a direct write, instead of truncating the page cache and taking the initialized size back
- if the zeroing fails, take the initialized size back to where it started, instead of skipping both rollbacks
v4: for a buffered write, zero the unwritten range instead of truncating the page cache and taking the initialized size back, which dropped data stored through a shared mapping during the copy (Baolin).
v3: clear the cache up to EOF, not up to the extended initialized size, which left the rest of the block holding pos + count (Baolin).
v2: also clear the cached tail of the last block, which v1 left in place when the write stayed inside the old data size (Baolin).
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Tested in a VM on ntfs-next b025f526c5d0, with all free space filled with a known pattern first. Short buffered writes of 4M, old data readable after drop_caches and after remount, 3 runs each:
unfixed v4 v5 fallocated, ends block-aligned 3137536 0 0 fallocated, ends inside a block 3141332 0 0 fallocated, unaligned start 3137536 0 0 same, pos + count in that page - 0 0 append 3137536 0 0
Marker stored through a shared mapping at 64K while pwritev() is stalled on a userfaultfd source page, state after remount, with and without fallocate():
unfixed v4 v5 buffered 4K at 128K, EFAULT lost lost kept O_DIRECT 12K at 0, EFAULT lost lost kept buffered 12K at 0, short 8192 (v3) kept kept kept
A store into [pos + ret, pos + count) itself during the write is zeroed, as that range belongs to the write. With iomap_zero_range() failing (injected -ENOMEM), a 32K write to a 16K file that returns 12288 leaves the size at 28K with no old data, also after remount. fsx (buffered, no-mmap, O_DIRECT and mixed), compressed files, fallocate, insert/collapse range and punch hole give the same results with v5 as with v4.
--- fs/ntfs/file.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 7 deletions(-)
fs/ntfs/file.c +62 -7
@@ -928,10 +928,21 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) ret =iomap_file_buffered_write (iocb, from, &ntfs_write_iomap_ops, &ntfs_iomap_folio_ops,NULL ); out: -if (ret <0 && ret != -EIOCBQUEUED ) { +/* +* Both sizes were moved to end before the copy, so a short write, +* like a failed one, must take back what it did not write. +*/ +if (ret < count && ret != -EIOCBQUEUED ) { +loff_t new_init_size = old_init_size; +loff_t new_data_size = old_data_size;int init_err =0 ;int data_err =0 ; +if (ret >0 ) { + new_init_size =max (old_init_size, pos + ret); + new_data_size =max (old_data_size, pos + ret); + } +/* * Like ntfs_setattr_size(): __ntfs_attr_truncate_vfs() * expects the invalidate lock held across the size
@@ -939,14 +950,58 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)*/ filemap_invalidate_lock (vi->i_mapping); +/* +* A page fault through a shared mapping may have used the +* extended initialized size while the write was stalled on +* its source, so keep that size and zero what the write did +* not reach instead. [old_init_size, pos) was zeroed before +* the write. Past end, zero the rest of the block that a +* buffered copy may have read from disk, unless such a fault +* already moved the initialized size past end and zeroed it. +*/ +if (NInoNonResident (ni) && !NInoCompressed (ni) && + ni->initialized_size > new_init_size) { +loff_t zstart =max (pos, new_init_size); +loff_t zend = ni->initialized_size > end ? end : +round_up (end,i_blocksize (vi)); +int err =0 ; + + zend =min (zend, new_data_size); +if (zend > zstart) { + err =iomap_zero_range (vi, zstart, + zend - zstart,NULL , + &ntfs_seek_iomap_ops, + &ntfs_iomap_folio_ops,NULL ); +/* A direct read must not see the old blocks. */ +if (!err && iocb->ki_flags &IOCB_DIRECT ) + err =filemap_write_and_wait_range ( + vi->i_mapping, zstart, zend -1 ); + } +if (!err) + new_init_size =min (ni->initialized_size, + new_data_size); +else + new_init_size =min (zstart, new_data_size); + } +/* ntfs_attr_set_initialized_size() rejects a resident one. */ -if (ni->initialized_size != old_init_size && +if (ni->initialized_size != new_init_size &&NInoNonResident (ni)) {struct ntfs_inode *mrec_ni =ntfs_base_inode (ni); +/* +* Only reached when the zeroing above failed or did +* not apply. Drop what was cached past the new +* initialized size, as __ntfs_extend_initialized_size() +* does. +*/ +if (ni->initialized_size > new_init_size) +truncate_pagecache_range (vi, new_init_size, +max_t (loff_t,i_size_read (vi), + ni->initialized_size) -1 );mutex_lock (&mrec_ni->mrec_lock); init_err =ntfs_attr_set_initialized_size (ni, - old_init_size); + new_init_size);mutex_unlock (&mrec_ni->mrec_lock); }/*
@@ -955,13 +1010,13 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)* the uninitialized tail, so skip it unless the rollback * above restored that size. */ -if (ni->data_size != old_data_size && !init_err) { +if (ni->data_size != new_data_size && !init_err) {struct ntfs_inode *mrec_ni =ntfs_base_inode (ni); -truncate_setsize (vi, old_data_size); +truncate_setsize (vi, new_data_size);mutex_lock (&mrec_ni->mrec_lock); - data_err =__ntfs_attr_truncate_vfs (ni, old_data_size, - old_data_size); + data_err =__ntfs_attr_truncate_vfs (ni, new_data_size, + new_data_size);mutex_unlock (&mrec_ni->mrec_lock);/* Like ntfs_setattr_size(): stay on the durable size. */ if (data_err)
base-commit: b025f526c5d04929212c9d5fb7ffc96608f3eacc
Signature · 1 line
2.43.0
Quoted 127 lines · Zhan Xusheng
From: Zhan Xusheng <[email protected]>
ntfs_file_write_iter()moves the data size and, for a non-resident uncompressed file, the initialized size to pos + count before the copy.__ntfs_extend_initialized_size()only zeroes [old initialized size, pos), so the range [pos, pos + count) is initialized only by the copy itself. Wheniomap_file_buffered_write()copies less than count, it returns a positive short count and the error rollback at out: does not run. The file keeps the size pos + count, and [pos + ret, pos + count) reads back whatever the freed clusters held before, also after a remount. A local user can read the old contents of freed clusters this way.Run the existing rollback for a short write as well, and roll the data size back to the end of what was written. Keep the initialized size, as a page fault through a shared mapping may rely on it while the write is stalled on its source, and zero what the write did not reach, up to the end of the block holding pos + count. Only if that fails, take the initialized size back to where the zeroing started.
Fixes b041ca562526 ("ntfs: update iomap and address space operations")Signed-off-by Zhan Xusheng <[email protected]>---
v5 (Baolin):
- start the zeroing at pos, not at the old initialized size, which overwrote data stored through a shared mapping below pos
- do the same for a direct write, instead of truncating the page cache and taking the initialized size back
- if the zeroing fails, take the initialized size back to where it started, instead of skipping both rollbacks
v4: for a buffered write, zero the unwritten range instead of truncating the page cache and taking the initialized size back, which dropped data stored through a shared mapping during the copy (Baolin).
v3: clear the cache up to EOF, not up to the extended initialized size, which left the rest of the block holding pos + count (Baolin).
v2: also clear the cached tail of the last block, which v1 left in place when the write stayed inside the old data size (Baolin).v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/Tested in a VM on ntfs-next
b025f526c5d0, with all free space filled with a known pattern first. Short buffered writes of 4M, old data readable afterdrop_cachesand after remount, 3 runs each:unfixed v4 v5 fallocated, ends block-aligned 3137536 0 0 fallocated, ends inside a block 3141332 0 0 fallocated, unaligned start 3137536 0 0 same, pos + count in that page - 0 0 append 3137536 0 0Marker stored through a shared mapping at 64K while
pwritev()is stalled on a userfaultfd source page, state after remount, with and withoutfallocate():unfixed v4 v5 buffered 4K at 128K, EFAULT lost lost kept O_DIRECT 12K at 0, EFAULT lost lost kept buffered 12K at 0, short 8192 (v3) kept kept keptA store into [pos + ret, pos + count) itself during the write is zeroed, as that range belongs to the write. With
iomap_zero_range()failing (injected-ENOMEM), a 32K write to a 16K file that returns 12288 leaves the size at 28K with no old data, also after remount. fsx (buffered, no-mmap,O_DIRECTand mixed), compressed files, fallocate, insert/collapse range and punch hole give the same results with v5 as with v4.--- fs/ntfs/file.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 7 deletions(-)fs/ntfs/file.c +34
-1@@ -928,10 +928,21 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) ret =iomap_file_buffered_write (iocb, from, &ntfs_write_iomap_ops, &ntfs_iomap_folio_ops,NULL ); out: -if (ret <0 && ret != -EIOCBQUEUED ) { +/* +* Both sizes were moved to end before the copy, so a short write, +* like a failed one, must take back what it did not write. +*/ +if (ret < count && ret != -EIOCBQUEUED ) { +loff_t new_init_size = old_init_size; +loff_t new_data_size = old_data_size;int init_err =0 ;int data_err =0 ; +if (ret >0 ) { + new_init_size =max (old_init_size, pos + ret); + new_data_size =max (old_data_size, pos + ret); + } +/* * Like ntfs_setattr_size(): __ntfs_attr_truncate_vfs() * expects the invalidate lock held across the size @@ -939,14 +950,58 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)*/ filemap_invalidate_lock (vi->i_mapping); +/* +* A page fault through a shared mapping may have used the +* extended initialized size while the write was stalled on +* its source, so keep that size and zero what the write did +* not reach instead. [old_init_size, pos) was zeroed before +* the write. Past end, zero the rest of the block that a +* buffered copy may have read from disk, unless such a fault +* already moved the initialized size past end and zeroed it. +*/ +if (NInoNonResident (ni) && !NInoCompressed (ni) && + ni->initialized_size > new_init_size) { +loff_t zstart =max (pos, new_init_size); +loff_t zend = ni->initialized_size > end ? end : +round_up (end,i_blocksize (vi)); +int err =0 ; + + zend =min (zend, new_data_size); +if (zend > zstart) { + err =iomap_zero_range (vi, zstart, + zend - zstart,NULL , + &ntfs_seek_iomap_ops, + &ntfs_iomap_folio_ops,NULL );
fs/ntfs/file.c ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) · line 984
Quoted 10 lines
fs/ntfs/file.c +10
-0+/* A direct read must not see the old blocks. */ +if (!err && iocb->ki_flags &IOCB_DIRECT ) + err =filemap_write_and_wait_range ( + vi->i_mapping, zstart, zend -1 ); + } +if (!err) + new_init_size =min (ni->initialized_size, + new_data_size); +else + new_init_size =min (zstart, new_data_size);
Hi Xusheng,
Thanks for v5 and for working through the feedback over the previous
versions.
There is one remaining adjustment from my review; with that
addressed, the patch looks good to me.
The out: path can also be reached whenntfs_extend_initialized_size() fails before the copy, leaving the current initialized size below pos.
If the cleanup zeroing also fails, this assignment can incorrectly increase the initialized size, exposing bytes that were never successfully initialized.
I suggest also capping the fallback at the current initialized size. This only requires a small change, replacing:
new_init_size = min(zstart, new_data_size);
with:
new_init_size = min3(ni->initialized_size, zstart,
new_data_size); This prevents the failure cleanup from increasing the initialized
size, while preserving the existing behavior when initialization before the copy succeeded.
Could you please send one more revision with this adjustment? Thanks
again for your patience and work on this fix.
Thanks,
Baolin.
Quoted 45 lines
fs/ntfs/file.c +18
-6+ } +/* ntfs_attr_set_initialized_size() rejects a resident one. */ -if (ni->initialized_size != old_init_size && +if (ni->initialized_size != new_init_size &&NInoNonResident (ni)) {struct ntfs_inode *mrec_ni =ntfs_base_inode (ni); +/* +* Only reached when the zeroing above failed or did +* not apply. Drop what was cached past the new +* initialized size, as __ntfs_extend_initialized_size() +* does. +*/ +if (ni->initialized_size > new_init_size) +truncate_pagecache_range (vi, new_init_size, +max_t (loff_t,i_size_read (vi), + ni->initialized_size) -1 );mutex_lock (&mrec_ni->mrec_lock); init_err =ntfs_attr_set_initialized_size (ni, - old_init_size); + new_init_size);mutex_unlock (&mrec_ni->mrec_lock); }/* @@ -955,13 +1010,13 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)* the uninitialized tail, so skip it unless the rollback * above restored that size. */ -if (ni->data_size != old_data_size && !init_err) { +if (ni->data_size != new_data_size && !init_err) {struct ntfs_inode *mrec_ni =ntfs_base_inode (ni); -truncate_setsize (vi, old_data_size); +truncate_setsize (vi, new_data_size);mutex_lock (&mrec_ni->mrec_lock); - data_err =__ntfs_attr_truncate_vfs (ni, old_data_size, - old_data_size); + data_err =__ntfs_attr_truncate_vfs (ni, new_data_size, + new_data_size);mutex_unlock (&mrec_ni->mrec_lock);/* Like ntfs_setattr_size(): stay on the durable size. */ if (data_err)base-commit:
b025f526c5d04929212c9d5fb7ffc96608f3eacc