Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5be79de2 authored by Tyler Hicks's avatar Tyler Hicks
Browse files

eCryptfs: Flush dirty pages in setattr

After 57db4e8d changed eCryptfs to
write-back caching, eCryptfs page writeback updates the lower inode
times due to the use of vfs_write() on the lower file.

To preserve inode metadata changes, such as 'cp -p' does with
utimensat(), we need to flush all dirty pages early in
ecryptfs_setattr() so that the user-updated lower inode metadata isn't
clobbered later in writeback.

https://bugzilla.kernel.org/show_bug.cgi?id=33372



Reported-by: default avatarRocko <rockorequin@hotmail.com>
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 3aeb86ea
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -929,6 +929,12 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
		}
	}
	mutex_unlock(&crypt_stat->cs_mutex);
	if (S_ISREG(inode->i_mode)) {
		rc = filemap_write_and_wait(inode->i_mapping);
		if (rc)
			goto out;
		fsstack_copy_attr_all(inode, lower_inode);
	}
	memcpy(&lower_ia, ia, sizeof(lower_ia));
	if (ia->ia_valid & ATTR_FILE)
		lower_ia.ia_file = ecryptfs_file_to_lower(ia->ia_file);