Skip to contentSkip to conversation

ecryptfs lower_file handling issues

PATCH New Dmitriy Monakhov 2 participants 2 messages Feb 19, 2007 – Feb 22, 2007 Ecrypt file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ecryptfs lower_file handling issues

1)Function ecryptfs_do_readpage() calls flush_dcache_page(lower_page),
but lower_page was't changed here. So remove this line.

2)prepare_write ret val was ignored in ecryptfs_write_inode_size_to_header(). If error happends we can't call commit_write, just do cleanup and fial. It is issue easy to reproduce with full lower_fs, in this case prepare_write() will return ENOSPC.

-------------

fs/ecryptfs/mmap.c +6 -1
index 1e5d2ba..0cebb75 100644
@@ -238,7 +238,6 @@ int ecryptfs_do_readpage(struct file *file, struct page *page,
 	lower_page_data = kmap_atomic(lower_page, KM_USER1);
 	memcpy(page_data, lower_page_data, PAGE_CACHE_SIZE);
 	kunmap_atomic(lower_page_data, KM_USER1);
-	flush_dcache_page(lower_page);
 	kunmap_atomic(page_data, KM_USER0);
 	flush_dcache_page(page);
 	rc = 0;
@@ -454,6 +453,12 @@ static int ecryptfs_write_inode_size_to_header(struct file *lower_file,
 	}
 	lower_a_ops = lower_inode->i_mapping->a_ops;
 	rc = lower_a_ops->prepare_write(lower_file, header_page, 0, 8);
+	if (rc) {
+		ecryptfs_printk(KERN_ERR, "Error preparing header page "
+			"write\n");
+		ecryptfs_release_lower_page(header_page);
+		goto out;
+	}
 	file_size = (u64)i_size_read(inode);
 	ecryptfs_printk(KERN_DEBUG, "Writing size: [0x%.16x]\n", file_size);
 	file_size = cpu_to_be64(file_size);
#1 lore raw

PATCH 1/1 ecryptfs remove unnecessary flush_dcache_page

Quoted 6 lines · Dmitriy Monakhov

1)Function ecryptfs_do_readpage() calls flush_dcache_page(lower_page),
but lower_page was't changed here. So remove this line.

2)prepare_write ret val was ignored in ecryptfs_write_inode_size_to_header(). If error happends we can't call commit_write, just do cleanup and fial. It is issue easy to reproduce with full lower_fs, in this case prepare_write()

Second issue was fixed by "ecryptfs-resolve-lower-page-unlocking-problem.patch", but first issue was't.

[LOG]
Function ecryptfs_do_readpage() calls flush_dcache_page(lower_page), but lower_page was't changed here. Even if it was changed by lower_a_ops->readpage() dcache was flushed by readpage() itself. So remove this unnecessary line.

fs/ecryptfs/mmap.c +0 -1
index 1e5d2ba..2e45513 100644
@@ -238,7 +238,6 @@ int ecryptfs_do_readpage(struct file *file, struct page *page,
 	lower_page_data = kmap_atomic(lower_page, KM_USER1);
 	memcpy(page_data, lower_page_data, PAGE_CACHE_SIZE);
 	kunmap_atomic(lower_page_data, KM_USER1);
-	flush_dcache_page(lower_page);
 	kunmap_atomic(page_data, KM_USER0);
 	flush_dcache_page(page);
 	rc = 0;