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

Commit fed8859b authored by Tyler Hicks's avatar Tyler Hicks
Browse files

eCryptfs: Remove ECRYPTFS_NEW_FILE crypt stat flag 



Now that grow_file() is not called in the ecryptfs_create() path, the
ECRYPTFS_NEW_FILE flag is no longer needed. It helped
ecryptfs_readpage() know not to decrypt zeroes that were read from the
lower file in the grow_file() path.

Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent bd4f0fe8

fs/ecryptfs/ecryptfs_kernel.h

+12 −13
Original line number Diff line number Diff line
@@ -257,19 +257,18 @@ struct ecryptfs_filename { 
struct ecryptfs_crypt_stat {

#define ECRYPTFS_STRUCT_INITIALIZED   0x00000001

#define ECRYPTFS_POLICY_APPLIED       0x00000002

#define ECRYPTFS_NEW_FILE             0x00000004

#define ECRYPTFS_ENCRYPTED            0x00000008

#define ECRYPTFS_SECURITY_WARNING     0x00000010

#define ECRYPTFS_ENABLE_HMAC          0x00000020

#define ECRYPTFS_ENCRYPT_IV_PAGES     0x00000040

#define ECRYPTFS_KEY_VALID            0x00000080

#define ECRYPTFS_METADATA_IN_XATTR    0x00000100

#define ECRYPTFS_VIEW_AS_ENCRYPTED    0x00000200

#define ECRYPTFS_KEY_SET              0x00000400

#define ECRYPTFS_ENCRYPT_FILENAMES    0x00000800

#define ECRYPTFS_ENCFN_USE_MOUNT_FNEK 0x00001000

#define ECRYPTFS_ENCFN_USE_FEK        0x00002000

#define ECRYPTFS_UNLINK_SIGS	      0x00004000

#define ECRYPTFS_ENCRYPTED            0x00000004

#define ECRYPTFS_SECURITY_WARNING     0x00000008

#define ECRYPTFS_ENABLE_HMAC          0x00000010

#define ECRYPTFS_ENCRYPT_IV_PAGES     0x00000020

#define ECRYPTFS_KEY_VALID            0x00000040

#define ECRYPTFS_METADATA_IN_XATTR    0x00000080

#define ECRYPTFS_VIEW_AS_ENCRYPTED    0x00000100

#define ECRYPTFS_KEY_SET              0x00000200

#define ECRYPTFS_ENCRYPT_FILENAMES    0x00000400

#define ECRYPTFS_ENCFN_USE_MOUNT_FNEK 0x00000800

#define ECRYPTFS_ENCFN_USE_FEK        0x00001000

#define ECRYPTFS_UNLINK_SIGS          0x00002000

	u32 flags;

	unsigned int file_version;

	size_t iv_bytes;

fs/ecryptfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry) 
		crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);

		goto out;

	}

	crypt_stat->flags |= ECRYPTFS_NEW_FILE;

	ecryptfs_printk(KERN_DEBUG, "Initializing crypto context\n");

	rc = ecryptfs_new_file_context(ecryptfs_dentry);

	if (rc) {

fs/ecryptfs/mmap.c

+2 −13
Original line number Diff line number Diff line
@@ -193,11 +193,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page) 
		&ecryptfs_inode_to_private(page->mapping->host)->crypt_stat;

	int rc = 0;



	if (!crypt_stat

	    || !(crypt_stat->flags & ECRYPTFS_ENCRYPTED)

	    || (crypt_stat->flags & ECRYPTFS_NEW_FILE)) {

		ecryptfs_printk(KERN_DEBUG,

				"Passing through unencrypted page\n");

	if (!crypt_stat || !(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {

		rc = ecryptfs_read_lower_page_segment(page, page->index, 0,

						      PAGE_CACHE_SIZE,

						      page->mapping->host);
@@ -295,8 +291,7 @@ static int ecryptfs_write_begin(struct file *file, 
		struct ecryptfs_crypt_stat *crypt_stat =

			&ecryptfs_inode_to_private(mapping->host)->crypt_stat;



		if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)

		    || (crypt_stat->flags & ECRYPTFS_NEW_FILE)) {

		if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {

			rc = ecryptfs_read_lower_page_segment(

				page, index, 0, PAGE_CACHE_SIZE, mapping->host);

			if (rc) {
@@ -487,12 +482,6 @@ static int ecryptfs_write_end(struct file *file, 
		&ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat;

	int rc;



	if (crypt_stat->flags & ECRYPTFS_NEW_FILE) {

		ecryptfs_printk(KERN_DEBUG, "ECRYPTFS_NEW_FILE flag set in "

			"crypt_stat at memory location [%p]\n", crypt_stat);

		crypt_stat->flags &= ~(ECRYPTFS_NEW_FILE);

	} else

		ecryptfs_printk(KERN_DEBUG, "Not a new file\n");

	ecryptfs_printk(KERN_DEBUG, "Calling fill_zeros_to_end_of_page"

			"(page w/ index = [0x%.16lx], to = [%d])\n", index, to);

	if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {