Skip to contentSkip to conversation

smb: client: fix data corruption with concurrent writes and O_TRUNC

PATCH In review Paulo Alcantara 2 participants 4 messages Aug 28 – Aug 31

Subsystems (3)
lore
Share & tools
lore

Paulo Alcantara

author maintainer
#0 lore raw

PATCH 1/1 smb: client: fix data corruption with concurrent writes and O_TRUNC

cifs_do_truncate() flushes dirty pages with filemap_write_and_wait() and truncates the file on the server, but in the old code both operations ran without holding i_rwsem or invalidate_lock. A concurrent buffered write via netfs_perform_write() -- which only needs i_rwsem shared -- could dirty new pages after the flush but before the local truncation, and those pages would be silently discarded by cifs_setsize() -> truncate_pagecache().

Fix by acquiring inode_lock (exclusive i_rwsem) and filemap_invalidate_lock at the top of cifs_do_truncate(), so the entire flush-truncate-resize sequence is atomic with respect to:

- buffered writes (blocked by exclusive i_rwsem, since netfs_start_io_write takes i_rwsem shared),
- read page faults (blocked by exclusive invalidate_lock, since filemap_fault takes it shared),
- writeback collection (blocked by netfs_wb_begin/netfs_wb_end around the server truncate and local resize, since netfs_writepages also acquires the wb lock).

Fixes 110fee6b9bb5 ("smb: client: fix missing timestamp updates with O_TRUNC")
Cc Ronnie Sahlberg <[email protected]>
Cc Shyam Prasad N <[email protected]>
Cc Tom Talpey <[email protected]>
Cc Bharath SM <[email protected]>
Cc Namjae Jeon <[email protected]>
---
 fs/smb/client/file.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
fs/smb/client/file.c +18 -10
index 100acc76e9be..61f9c6ccc6be 100644
@@ -999,42 +999,50 @@ static int cifs_do_truncate(const unsigned int xid, struct dentry *dentry)
 	struct cifs_tcon *tcon;
 	int rc;
 
-	rc = filemap_write_and_wait(inode->i_mapping);
-	if (is_interrupt_error(rc))
+	rc = inode_lock_killable(inode);
+	if (rc)
 		return -ERESTARTSYS;
+
+	filemap_invalidate_lock(inode->i_mapping);
+
+	rc = filemap_write_and_wait(inode->i_mapping);
+	if (is_interrupt_error(rc)) {
+		rc = -ERESTARTSYS;
+		goto out;
+	}
 	mapping_set_error(inode->i_mapping, rc);
 
 	cfile = find_writable_file(cinode, FIND_FSUID_ONLY);
 	rc = cifs_file_flush(xid, inode, cfile);
 	if (!rc) {
 		if (cfile) {
+			struct netfs_inode *ictx = netfs_inode(inode);
+
 			tcon = tlink_tcon(cfile->tlink);
 			server = tcon->ses->server;
+			netfs_wb_begin(ictx, false);
 			rc = server->ops->set_file_size(xid, tcon,
 							cfile, 0, false);
 			if (!rc) {
-				inode_lock(inode);
-				filemap_invalidate_lock(inode->i_mapping);
 				netfs_resize_file(&cinode->netfs, 0, true);
 				cifs_setsize(inode, 0);
-				filemap_invalidate_unlock(inode->i_mapping);
-				inode_unlock(inode);
 				cifs_invalidate_cache(inode, 0);
 			}
+			netfs_wb_end(ictx);
 		} else {
 			/*
 			 * No cached handle; evict stale pages so they can't
 			 * be served after the file is later extended; let
 			 * the server's O_TRUNC open response set the i_size
 			 */
-			inode_lock(inode);
-			filemap_invalidate_lock(inode->i_mapping);
 			truncate_inode_pages(inode->i_mapping, 0);
-			filemap_invalidate_unlock(inode->i_mapping);
-			inode_unlock(inode);
 			cifs_invalidate_cache(inode, 0);
 		}
 	}
+
+out:
+	filemap_invalidate_unlock(inode->i_mapping);
+	inode_unlock(inode);
 	if (cfile)
 		cifsFileInfo_put(cfile);
 	return rc;
Signature · 1 line
2.55.0
maintainer
#1 lore raw

fs/smb/client/file.c static int cifs_do_truncate(const unsigned int xid, struct dentry *dentry) · line 1006

Quoted 11 lines
fs/smb/client/file.c +4 -2
@@ -999,42 +999,50 @@ static int cifs_do_truncate(const unsigned int xid, struct dentry *dentry)
        struct cifs_tcon *tcon;
        int rc;
 
-       rc = filemap_write_and_wait(inode->i_mapping);
-       if (is_interrupt_error(rc))
+       rc = inode_lock_killable(inode);
+       if (rc)
                return -ERESTARTSYS;
+
+       filemap_invalidate_lock(inode->i_mapping);

Should we also take filemap_invalidate_lock_shared() in the page_mkwrite path to serialize mmap writes with this truncate path?

author maintainer
#2 lore raw
Quoted 2 lines · Namjae Jeon

Should we also take filemap_invalidate_lock_shared() in the page_mkwrite path to serialize mmap writes with this truncate path?

I don't think so. It's serialised by the folio lock that netfs_page_mkwrite() and truncate_inode_pages() take. Also, if a new writable page was added between the first unmap and truncate_inode_pages(), or if a new page is about to be become writable, both paths should go through filemap_fault(), which takes invalidate_lock shared, so they will both serialise with invalidate_lock exclusive in cifs_do_truncate().

maintainer Reviewed-by
#3 lore raw
Quoted 6 lines · Paulo Alcantara
Quoted 2 lines · Namjae Jeon

Should we also take filemap_invalidate_lock_shared() in the page_mkwrite path to serialize mmap writes with this truncate path?

Quoted 7 lines

I don't think so. It's serialised by the folio lock that netfs_page_mkwrite() and truncate_inode_pages() take. Also, if a new writable page was added between the first unmap and truncate_inode_pages(), or if a new page is about to be become writable, both paths should go through filemap_fault(), which takes invalidate_lock shared, so they will both serialise with invalidate_lock exclusive in cifs_do_truncate().

Agreed.

Thanks!