[PATCH] eCryptfs: Generalize metadata read/write (dd2a3b7a) · Commits · e / devices / android_kernel_fairphone_FP4

fs/ecryptfs/crypto.c

+178 −56

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Copyright (C) 1997-2004 Erez Zadok
		* Copyright (C) 2001-2004 Stony Brook University
		* Copyright (C) 2004-2006 International Business Machines Corp.
		* Copyright (C) 2004-2007 International Business Machines Corp.
		* Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
		* Michael C. Thompson <mcthomps@us.ibm.com>
		*
		@@ -863,6 +863,9 @@ void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat)
		ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE;
		} else
		crypt_stat->header_extent_size = PAGE_CACHE_SIZE;
		if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
		crypt_stat->num_header_extents_at_front = 0;
		else
		crypt_stat->num_header_extents_at_front = 1;
		}

		@@ -1021,7 +1024,7 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry)
		*
		* Returns one if marker found; zero if not found
		*/
		int contains_ecryptfs_marker(char *data)
		static int contains_ecryptfs_marker(char *data)
		{
		u32 m_1, m_2;

		@@ -1047,7 +1050,8 @@ struct ecryptfs_flag_map_elem {
		/* Add support for additional flags by adding elements here. */
		static struct ecryptfs_flag_map_elem ecryptfs_flag_map[] = {
		{0x00000001, ECRYPTFS_ENABLE_HMAC},
		{0x00000002, ECRYPTFS_ENCRYPTED}
		{0x00000002, ECRYPTFS_ENCRYPTED},
		{0x00000004, ECRYPTFS_METADATA_IN_XATTR}
		};

		/**
		@@ -1207,7 +1211,7 @@ int ecryptfs_cipher_code_to_string(char *str, u16 cipher_code)
		*
		* Returns zero on success; non-zero otherwise
		*/
		int ecryptfs_read_header_region(char data, struct dentry dentry,
		static int ecryptfs_read_header_region(char data, struct dentry dentry,
		struct vfsmount *mnt)
		{
		struct file *lower_file;
		@@ -1237,6 +1241,21 @@ int ecryptfs_read_header_region(char data, struct dentry dentry,
		return rc;
		}

		int ecryptfs_read_and_validate_header_region(char data, struct dentry dentry,
		struct vfsmount *mnt)
		{
		int rc;

		rc = ecryptfs_read_header_region(data, dentry, mnt);
		if (rc)
		goto out;
		if (!contains_ecryptfs_marker(data + ECRYPTFS_FILE_SIZE_BYTES))
		rc = -EINVAL;
		out:
		return rc;
		}


		static void
		write_header_metadata(char virt, struct ecryptfs_crypt_stat crypt_stat,
		size_t *written)
		@@ -1288,7 +1307,7 @@ struct kmem_cache *ecryptfs_header_cache_2;
		*
		* Returns zero on success
		*/
		int ecryptfs_write_headers_virt(char *page_virt,
		static int ecryptfs_write_headers_virt(char page_virt, size_t size,
		struct ecryptfs_crypt_stat *crypt_stat,
		struct dentry *ecryptfs_dentry)
		{
		@@ -1309,11 +1328,53 @@ int ecryptfs_write_headers_virt(char *page_virt,
		if (rc)
		ecryptfs_printk(KERN_WARNING, "Error generating key packet "
		"set; rc = [%d]\n", rc);
		if (size) {
		offset += written;
		*size = offset;
		}
		return rc;
		}

		static int ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat,
		struct file *lower_file,
		char *page_virt)
		{
		mm_segment_t oldfs;
		int current_header_page;
		int header_pages;

		lower_file->f_pos = 0;
		oldfs = get_fs();
		set_fs(get_ds());
		lower_file->f_op->write(lower_file, (char __user *)page_virt,
		PAGE_CACHE_SIZE, &lower_file->f_pos);
		header_pages = ((crypt_stat->header_extent_size
		* crypt_stat->num_header_extents_at_front)
		/ PAGE_CACHE_SIZE);
		memset(page_virt, 0, PAGE_CACHE_SIZE);
		current_header_page = 1;
		while (current_header_page < header_pages) {
		lower_file->f_op->write(lower_file, (char __user *)page_virt,
		PAGE_CACHE_SIZE, &lower_file->f_pos);
		current_header_page++;
		}
		set_fs(oldfs);
		return 0;
		}

		static int ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
		struct ecryptfs_crypt_stat *crypt_stat,
		char *page_virt, size_t size)
		{
		int rc;

		rc = ecryptfs_setxattr(ecryptfs_dentry, ECRYPTFS_XATTR_NAME, page_virt,
		size, 0);
		return rc;
		}

		/**
		* ecryptfs_write_headers
		* ecryptfs_write_metadata
		* @lower_file: The lower file struct, which was returned from dentry_open
		*
		* Write the file headers out. This will likely involve a userspace
		@@ -1324,14 +1385,12 @@ int ecryptfs_write_headers_virt(char *page_virt,
		*
		* Returns zero on success; non-zero on error
		*/
		int ecryptfs_write_headers(struct dentry *ecryptfs_dentry,
		int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry,
		struct file *lower_file)
		{
		mm_segment_t oldfs;
		struct ecryptfs_crypt_stat *crypt_stat;
		char *page_virt;
		int current_header_page;
		int header_pages;
		size_t size;
		int rc = 0;

		crypt_stat = &ecryptfs_inode_to_private(
		@@ -1358,48 +1417,36 @@ int ecryptfs_write_headers(struct dentry *ecryptfs_dentry,
		rc = -ENOMEM;
		goto out;
		}

		rc = ecryptfs_write_headers_virt(page_virt, crypt_stat,
		rc = ecryptfs_write_headers_virt(page_virt, &size, crypt_stat,
		ecryptfs_dentry);
		if (unlikely(rc)) {
		ecryptfs_printk(KERN_ERR, "Error whilst writing headers\n");
		memset(page_virt, 0, PAGE_CACHE_SIZE);
		goto out_free;
		}
		ecryptfs_printk(KERN_DEBUG,
		"Writing key packet set to underlying file\n");
		lower_file->f_pos = 0;
		oldfs = get_fs();
		set_fs(get_ds());
		ecryptfs_printk(KERN_DEBUG, "Calling lower_file->f_op->"
		"write() w/ header page; lower_file->f_pos = "
		"[0x%.16x]\n", lower_file->f_pos);
		lower_file->f_op->write(lower_file, (char __user *)page_virt,
		PAGE_CACHE_SIZE, &lower_file->f_pos);
		header_pages = ((crypt_stat->header_extent_size
		* crypt_stat->num_header_extents_at_front)
		/ PAGE_CACHE_SIZE);
		memset(page_virt, 0, PAGE_CACHE_SIZE);
		current_header_page = 1;
		while (current_header_page < header_pages) {
		ecryptfs_printk(KERN_DEBUG, "Calling lower_file->f_op->"
		"write() w/ zero'd page; lower_file->f_pos = "
		"[0x%.16x]\n", lower_file->f_pos);
		lower_file->f_op->write(lower_file, (char __user *)page_virt,
		PAGE_CACHE_SIZE, &lower_file->f_pos);
		current_header_page++;
		if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
		rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry,
		crypt_stat, page_virt,
		size);
		else
		rc = ecryptfs_write_metadata_to_contents(crypt_stat, lower_file,
		page_virt);
		if (rc) {
		printk(KERN_ERR "Error writing metadata out to lower file; "
		"rc = [%d]\n", rc);
		goto out_free;
		}
		set_fs(oldfs);
		ecryptfs_printk(KERN_DEBUG,
		"Done writing key packet set to underlying file.\n");
		out_free:
		kmem_cache_free(ecryptfs_header_cache_0, page_virt);
		out:
		return rc;
		}

		#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0
		#define ECRYPTFS_VALIDATE_HEADER_SIZE 1
		static int parse_header_metadata(struct ecryptfs_crypt_stat *crypt_stat,
		char virt, int bytes_read)
		char virt, int bytes_read,
		int validate_header_size)
		{
		int rc = 0;
		u32 header_extent_size;
		@@ -1414,9 +1461,10 @@ static int parse_header_metadata(struct ecryptfs_crypt_stat *crypt_stat,
		crypt_stat->num_header_extents_at_front =
		(int)num_header_extents_at_front;
		(*bytes_read) = 6;
		if ((crypt_stat->header_extent_size
		if ((validate_header_size == ECRYPTFS_VALIDATE_HEADER_SIZE)
		&& ((crypt_stat->header_extent_size
		* crypt_stat->num_header_extents_at_front)
		< ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE) {
		< ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE)) {
		rc = -EINVAL;
		ecryptfs_printk(KERN_WARNING, "Invalid header extent size: "
		"[%d]\n", crypt_stat->header_extent_size);
		@@ -1447,7 +1495,8 @@ static void set_default_header_data(struct ecryptfs_crypt_stat *crypt_stat)
		*/
		static int ecryptfs_read_headers_virt(char *page_virt,
		struct ecryptfs_crypt_stat *crypt_stat,
		struct dentry *ecryptfs_dentry)
		struct dentry *ecryptfs_dentry,
		int validate_header_size)
		{
		int rc = 0;
		int offset;
		@@ -1481,7 +1530,7 @@ static int ecryptfs_read_headers_virt(char *page_virt,
		offset += bytes_read;
		if (crypt_stat->file_version >= 1) {
		rc = parse_header_metadata(crypt_stat, (page_virt + offset),
		&bytes_read);
		&bytes_read, validate_header_size);
		if (rc) {
		ecryptfs_printk(KERN_WARNING, "Error reading header "
		"metadata; rc = [%d]\n", rc);
		@@ -1496,11 +1545,59 @@ static int ecryptfs_read_headers_virt(char *page_virt,
		}

		/**
		* ecryptfs_read_headers
		* ecryptfs_read_xattr_region
		*
		* Attempts to read the crypto metadata from the extended attribute
		* region of the lower file.
		*/
		int ecryptfs_read_xattr_region(char page_virt, struct dentry ecryptfs_dentry)
		{
		ssize_t size;
		int rc = 0;

		size = ecryptfs_getxattr(ecryptfs_dentry, ECRYPTFS_XATTR_NAME,
		page_virt, ECRYPTFS_DEFAULT_EXTENT_SIZE);
		if (size < 0) {
		printk(KERN_DEBUG "Error attempting to read the [%s] "
		"xattr from the lower file; return value = [%zd]\n",
		ECRYPTFS_XATTR_NAME, size);
		rc = -EINVAL;
		goto out;
		}
		out:
		return rc;
		}

		int ecryptfs_read_and_validate_xattr_region(char *page_virt,
		struct dentry *ecryptfs_dentry)
		{
		int rc;

		rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_dentry);
		if (rc)
		goto out;
		if (!contains_ecryptfs_marker(page_virt + ECRYPTFS_FILE_SIZE_BYTES)) {
		printk(KERN_WARNING "Valid data found in [%s] xattr, but "
		"the marker is invalid\n", ECRYPTFS_XATTR_NAME);
		rc = -EINVAL;
		}
		out:
		return rc;
		}

		/**
		* ecryptfs_read_metadata
		*
		* Common entry point for reading file metadata. From here, we could
		* retrieve the header information from the header region of the file,
		* the xattr region of the file, or some other repostory that is
		* stored separately from the file itself. The current implementation
		* supports retrieving the metadata information from the file contents
		* and from the xattr region.
		*
		* Returns zero if valid headers found and parsed; non-zero otherwise
		*/
		int ecryptfs_read_headers(struct dentry *ecryptfs_dentry,
		int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry,
		struct file *lower_file)
		{
		int rc = 0;
		@@ -1530,11 +1627,36 @@ int ecryptfs_read_headers(struct dentry *ecryptfs_dentry,
		goto out;
		}
		rc = ecryptfs_read_headers_virt(page_virt, crypt_stat,
		ecryptfs_dentry,
		ECRYPTFS_VALIDATE_HEADER_SIZE);
		if (rc) {
		rc = ecryptfs_read_xattr_region(page_virt,
		ecryptfs_dentry);
		if (rc) {
		ecryptfs_printk(KERN_DEBUG, "Valid eCryptfs headers not "
		"found\n");
		printk(KERN_DEBUG "Valid eCryptfs headers not found in "
		"file header region or xattr region\n");
		rc = -EINVAL;
		goto out;
		}
		rc = ecryptfs_read_headers_virt(page_virt, crypt_stat,
		ecryptfs_dentry,
		ECRYPTFS_DONT_VALIDATE_HEADER_SIZE);
		if (rc) {
		printk(KERN_DEBUG "Valid eCryptfs headers not found in "
		"file xattr region either\n");
		rc = -EINVAL;
		}
		if (crypt_stat->mount_crypt_stat->flags
		& ECRYPTFS_XATTR_METADATA_ENABLED) {
		crypt_stat->flags \|= ECRYPTFS_METADATA_IN_XATTR;
		} else {
		printk(KERN_WARNING "Attempt to access file with "
		"crypto metadata only in the extended attribute "
		"region, but eCryptfs was mounted without "
		"xattr support enabled. eCryptfs will not treat "
		"this like an encrypted file.\n");
		rc = -EINVAL;
		}
		}
		out:
		if (page_virt) {

fs/ecryptfs/ecryptfs_kernel.h

+24 −27

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		*
		* Copyright (C) 1997-2003 Erez Zadok
		* Copyright (C) 2001-2003 Stony Brook University
		* Copyright (C) 2004-2006 International Business Machines Corp.
		* Copyright (C) 2004-2007 International Business Machines Corp.
		* Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
		* Trevor S. Highland <trevor.highland@gmail.com>
		* Tyler Hicks <tyhicks@ou.edu>
		@@ -50,8 +50,8 @@
		#define ECRYPTFS_VERSIONING_XATTR 0x00000010
		#define ECRYPTFS_VERSIONING_MASK (ECRYPTFS_VERSIONING_PASSPHRASE \
		\| ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH \
		\| ECRYPTFS_VERSIONING_PUBKEY)

		\| ECRYPTFS_VERSIONING_PUBKEY \
		\| ECRYPTFS_VERSIONING_XATTR)
		#define ECRYPTFS_MAX_PASSWORD_LENGTH 64
		#define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH
		#define ECRYPTFS_SALT_SIZE 8
		@@ -83,6 +83,7 @@
		#define ECRYPTFS_TRANSPORT_CONNECTOR 1
		#define ECRYPTFS_TRANSPORT_RELAYFS 2
		#define ECRYPTFS_DEFAULT_TRANSPORT ECRYPTFS_TRANSPORT_NETLINK
		#define ECRYPTFS_XATTR_NAME "user.ecryptfs"

		#define RFC2440_CIPHER_DES3_EDE 0x02
		#define RFC2440_CIPHER_CAST_5 0x03
		@@ -327,18 +328,6 @@ struct ecryptfs_msg_ctx {
		struct mutex mux;
		};

		extern struct list_head ecryptfs_msg_ctx_free_list;
		extern struct list_head ecryptfs_msg_ctx_alloc_list;
		extern struct mutex ecryptfs_msg_ctx_lists_mux;

		#define ecryptfs_uid_hash(uid) \
		hash_long((unsigned long)uid, ecryptfs_hash_buckets)
		extern struct hlist_head *ecryptfs_daemon_id_hash;
		extern struct mutex ecryptfs_daemon_id_hash_mux;
		extern int ecryptfs_hash_buckets;

		extern unsigned int ecryptfs_msg_counter;
		extern struct ecryptfs_msg_ctx *ecryptfs_msg_ctx_arr;
		extern unsigned int ecryptfs_transport;

		struct ecryptfs_daemon_id {
		@@ -479,6 +468,7 @@ extern struct kmem_cache *ecryptfs_sb_info_cache;
		extern struct kmem_cache *ecryptfs_header_cache_0;
		extern struct kmem_cache *ecryptfs_header_cache_1;
		extern struct kmem_cache *ecryptfs_header_cache_2;
		extern struct kmem_cache *ecryptfs_xattr_cache;
		extern struct kmem_cache *ecryptfs_lower_page_cache;

		int ecryptfs_interpose(struct dentry *hidden_dentry,
		@@ -505,9 +495,13 @@ int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat);
		int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,
		char *cipher_name,
		char *chaining_modifier);
		int ecryptfs_write_inode_size_to_header(struct file *lower_file,
		#define ECRYPTFS_LOWER_I_MUTEX_NOT_HELD 0
		#define ECRYPTFS_LOWER_I_MUTEX_HELD 1
		int ecryptfs_write_inode_size_to_metadata(struct file *lower_file,
		struct inode *lower_inode,
		struct inode *inode);
		struct inode *inode,
		struct dentry *ecryptfs_dentry,
		int lower_i_mutex_held);
		int ecryptfs_get_lower_page(struct page *lower_page, struct inode lower_inode,
		struct file *lower_file,
		unsigned long lower_page_index, int byte_offset,
		@@ -529,17 +523,15 @@ int ecryptfs_writepage_and_release_lower_page(struct page *lower_page,
		struct writeback_control *wbc);
		int ecryptfs_encrypt_page(struct ecryptfs_page_crypt_context *ctx);
		int ecryptfs_decrypt_page(struct file file, struct page page);
		int ecryptfs_write_headers(struct dentry *ecryptfs_dentry,
		int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry,
		struct file *lower_file);
		int ecryptfs_write_headers_virt(char *page_virt,
		struct ecryptfs_crypt_stat *crypt_stat,
		struct dentry *ecryptfs_dentry);
		int ecryptfs_read_headers(struct dentry *ecryptfs_dentry,
		int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry,
		struct file *lower_file);
		int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry);
		int contains_ecryptfs_marker(char *data);
		int ecryptfs_read_header_region(char data, struct dentry dentry,
		int ecryptfs_read_and_validate_header_region(char data, struct dentry dentry,
		struct vfsmount *mnt);
		int ecryptfs_read_and_validate_xattr_region(char *page_virt,
		struct dentry *ecryptfs_dentry);
		u16 ecryptfs_code_for_cipher_string(struct ecryptfs_crypt_stat *crypt_stat);
		int ecryptfs_cipher_code_to_string(char *str, u16 cipher_code);
		void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat);
		@@ -562,6 +554,11 @@ int ecryptfs_open_lower_file(struct file **lower_file,
		struct dentry *lower_dentry,
		struct vfsmount *lower_mnt, int flags);
		int ecryptfs_close_lower_file(struct file *lower_file);
		ssize_t ecryptfs_getxattr(struct dentry dentry, const char name, void *value,
		size_t size);
		int
		ecryptfs_setxattr(struct dentry dentry, const char name, const void *value,
		size_t size, int flags);

		int ecryptfs_process_helo(unsigned int transport, uid_t uid, pid_t pid);
		int ecryptfs_process_quit(uid_t uid, pid_t pid);

fs/ecryptfs/file.c

+6 −21

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Copyright (C) 1997-2004 Erez Zadok
		* Copyright (C) 2001-2004 Stony Brook University
		* Copyright (C) 2004-2006 International Business Machines Corp.
		* Copyright (C) 2004-2007 International Business Machines Corp.
		* Author(s): Michael A. Halcrow <mhalcrow@us.ibm.com>
		* Michael C. Thompson <mcthomps@us.ibm.com>
		*
		@@ -293,26 +293,11 @@ static int ecryptfs_open(struct inode inode, struct file file)
		goto out;
		}
		mutex_lock(&crypt_stat->cs_mutex);
		if (i_size_read(lower_inode) < ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE) {
		if (!(mount_crypt_stat->flags
		& ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {
		rc = -EIO;
		printk(KERN_WARNING "Attempt to read file that is "
		"not in a valid eCryptfs format, and plaintext "
		"passthrough mode is not enabled; returning "
		"-EIO\n");
		mutex_unlock(&crypt_stat->cs_mutex);
		goto out_puts;
		}
		crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
		rc = 0;
		mutex_unlock(&crypt_stat->cs_mutex);
		goto out;
		} else if (!ECRYPTFS_CHECK_FLAG(crypt_stat->flags,
		if (!ECRYPTFS_CHECK_FLAG(crypt_stat->flags,
		ECRYPTFS_POLICY_APPLIED)
		\|\| !ECRYPTFS_CHECK_FLAG(crypt_stat->flags,
		ECRYPTFS_KEY_VALID)) {
		rc = ecryptfs_read_headers(ecryptfs_dentry, lower_file);
		rc = ecryptfs_read_metadata(ecryptfs_dentry, lower_file);
		if (rc) {
		ecryptfs_printk(KERN_DEBUG,
		"Valid headers not found\n");

fs/ecryptfs/inode.c

+35 −26

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Copyright (C) 1997-2004 Erez Zadok
		* Copyright (C) 2001-2004 Stony Brook University
		* Copyright (C) 2004-2006 International Business Machines Corp.
		* Copyright (C) 2004-2007 International Business Machines Corp.
		* Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
		* Michael C. Thompsion <mcthomps@us.ibm.com>
		*
		@@ -169,7 +169,9 @@ static int grow_file(struct dentry ecryptfs_dentry, struct file lower_file,
		goto out;
		}
		i_size_write(inode, 0);
		ecryptfs_write_inode_size_to_header(lower_file, lower_inode, inode);
		ecryptfs_write_inode_size_to_metadata(lower_file, lower_inode, inode,
		ecryptfs_dentry,
		ECRYPTFS_LOWER_I_MUTEX_NOT_HELD);
		ECRYPTFS_SET_FLAG(ecryptfs_inode_to_private(inode)->crypt_stat.flags,
		ECRYPTFS_NEW_FILE);
		out:
		@@ -225,7 +227,7 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry)
		"context\n");
		goto out_fput;
		}
		rc = ecryptfs_write_headers(ecryptfs_dentry, lower_file);
		rc = ecryptfs_write_metadata(ecryptfs_dentry, lower_file);
		if (rc) {
		ecryptfs_printk(KERN_DEBUG, "Error writing headers\n");
		goto out_fput;
		@@ -369,25 +371,26 @@ static struct dentry ecryptfs_lookup(struct inode dir, struct dentry *dentry,
		"Cannot ecryptfs_kmalloc a page\n");
		goto out_dput;
		}

		rc = ecryptfs_read_header_region(page_virt, lower_dentry, nd->mnt);
		crypt_stat = &ecryptfs_inode_to_private(dentry->d_inode)->crypt_stat;
		if (!ECRYPTFS_CHECK_FLAG(crypt_stat->flags, ECRYPTFS_POLICY_APPLIED))
		ecryptfs_set_default_sizes(crypt_stat);
		rc = ecryptfs_read_and_validate_header_region(page_virt, lower_dentry,
		nd->mnt);
		if (rc) {
		rc = ecryptfs_read_and_validate_xattr_region(page_virt, dentry);
		if (rc) {
		printk(KERN_DEBUG "Valid metadata not found in header "
		"region or xattr region; treating file as "
		"unencrypted\n");
		rc = 0;
		ecryptfs_printk(KERN_WARNING, "Error reading header region;"
		" assuming unencrypted\n");
		} else {
		if (!contains_ecryptfs_marker(page_virt
		+ ECRYPTFS_FILE_SIZE_BYTES)) {
		kmem_cache_free(ecryptfs_header_cache_2, page_virt);
		goto out;
		}
		crypt_stat->flags \|= ECRYPTFS_METADATA_IN_XATTR;
		}
		memcpy(&file_size, page_virt, sizeof(file_size));
		file_size = be64_to_cpu(file_size);
		i_size_write(dentry->d_inode, (loff_t)file_size);
		}
		kmem_cache_free(ecryptfs_header_cache_2, page_virt);
		goto out;

		@@ -781,20 +784,26 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length)
		goto out_fput;
		}
		i_size_write(inode, new_length);
		rc = ecryptfs_write_inode_size_to_header(lower_file,
		lower_dentry->d_inode,
		inode);
		rc = ecryptfs_write_inode_size_to_metadata(
		lower_file, lower_dentry->d_inode, inode, dentry,
		ECRYPTFS_LOWER_I_MUTEX_NOT_HELD);
		if (rc) {
		ecryptfs_printk(KERN_ERR,
		"Problem with ecryptfs_write"
		"_inode_size\n");
		printk(KERN_ERR "Problem with "
		"ecryptfs_write_inode_size_to_metadata; "
		"rc = [%d]\n", rc);
		goto out_fput;
		}
		} else { /* new_length < i_size_read(inode) */
		vmtruncate(inode, new_length);
		ecryptfs_write_inode_size_to_header(lower_file,
		lower_dentry->d_inode,
		inode);
		rc = ecryptfs_write_inode_size_to_metadata(
		lower_file, lower_dentry->d_inode, inode, dentry,
		ECRYPTFS_LOWER_I_MUTEX_NOT_HELD);
		if (rc) {
		printk(KERN_ERR "Problem with "
		"ecryptfs_write_inode_size_to_metadata; "
		"rc = [%d]\n", rc);
		goto out_fput;
		}
		/* We are reducing the size of the ecryptfs file, and need to
		* know if we need to reduce the size of the lower file. */
		lower_size_before_truncate =
		@@ -881,7 +890,7 @@ static int ecryptfs_setattr(struct dentry dentry, struct iattr ia)
		return rc;
		}

		static int
		int
		ecryptfs_setxattr(struct dentry dentry, const char name, const void *value,
		size_t size, int flags)
		{
		@@ -901,7 +910,7 @@ ecryptfs_setxattr(struct dentry dentry, const char name, const void *value,
		return rc;
		}

		static ssize_t
		ssize_t
		ecryptfs_getxattr(struct dentry dentry, const char name, void *value,
		size_t size)
		{

fs/ecryptfs/main.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Copyright (C) 1997-2003 Erez Zadok
		* Copyright (C) 2001-2003 Stony Brook University
		* Copyright (C) 2004-2006 International Business Machines Corp.
		* Copyright (C) 2004-2007 International Business Machines Corp.
		* Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
		* Michael C. Thompson <mcthomps@us.ibm.com>
		* Tyler Hicks <tyhicks@ou.edu>
		@@ -641,6 +641,11 @@ static struct ecryptfs_cache_info {
		.name = "ecryptfs_headers_2",
		.size = PAGE_CACHE_SIZE,
		},
		{
		.cache = &ecryptfs_xattr_cache,
		.name = "ecryptfs_xattr_cache",
		.size = PAGE_CACHE_SIZE,
		},
		{
		.cache = &ecryptfs_lower_page_cache,
		.name = "ecryptfs_lower_page_cache",