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

Commit 410fc4ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-3.6-rc1-fixes' of... 

Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull ecryptfs fixes from Tyler Hicks:
 - Fixes a bug when the lower filesystem mount options include 'acl',
   but the eCryptfs mount options do not
 - Cleanups in the messaging code
 - Better handling of empty files in the lower filesystem to improve
   usability.  Failed file creations are now cleaned up and empty lower
   files are converted into eCryptfs during open().
 - The write-through cache changes are being reverted due to bugs that
   are not easy to fix.  Stability outweighs the performance
   enhancements here.
 - Improvement to the mount code to catch unsupported ciphers specified
   in the mount options

* tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: check for eCryptfs cipher support at mount
  eCryptfs: Revert to a writethrough cache model
  eCryptfs: Initialize empty lower files when opening them
  eCryptfs: Unlink lower inode when ecryptfs_create() fails
  eCryptfs: Make all miscdev functions use daemon ptr in file private_data
  eCryptfs: Remove unused messaging declarations and function
  eCryptfs: Copy up POSIX ACL and read-only flags from lower mount
parents 630103ea 5f5b331d

fs/ecryptfs/ecryptfs_kernel.h

+7 −17
Original line number Diff line number Diff line
@@ -385,8 +385,6 @@ struct ecryptfs_msg_ctx { 
	struct mutex mux;

};



struct ecryptfs_daemon;



struct ecryptfs_daemon {

#define ECRYPTFS_DAEMON_IN_READ      0x00000001

#define ECRYPTFS_DAEMON_IN_POLL      0x00000002
@@ -394,10 +392,7 @@ struct ecryptfs_daemon { 
#define ECRYPTFS_DAEMON_MISCDEV_OPEN 0x00000008

	u32 flags;

	u32 num_queued_msg_ctx;

	struct pid *pid;

	uid_t euid;

	struct user_namespace *user_ns;

	struct task_struct *task;

	struct file *file;

	struct mutex mux;

	struct list_head msg_ctx_out_queue;

	wait_queue_head_t wait;
@@ -554,6 +549,8 @@ extern struct kmem_cache *ecryptfs_key_tfm_cache; 
struct inode *ecryptfs_get_inode(struct inode *lower_inode,

				 struct super_block *sb);

void ecryptfs_i_size_init(const char *page_virt, struct inode *inode);

int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,

			     struct inode *ecryptfs_inode);

int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,

					 size_t *decrypted_name_size,

					 struct dentry *ecryptfs_dentry,
@@ -607,13 +604,8 @@ int 
ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,

		  size_t size, int flags);

int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode);

int ecryptfs_process_helo(uid_t euid, struct user_namespace *user_ns,

			  struct pid *pid);

int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns,

			  struct pid *pid);

int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,

			      struct user_namespace *user_ns, struct pid *pid,

			      u32 seq);

int ecryptfs_process_response(struct ecryptfs_daemon *daemon,

			      struct ecryptfs_message *msg, u32 seq);

int ecryptfs_send_message(char *data, int data_len,

			  struct ecryptfs_msg_ctx **msg_ctx);

int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx,
@@ -658,8 +650,7 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs, 
				     struct inode *ecryptfs_inode);

struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index);

int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon);

int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid,

				 struct user_namespace *user_ns);

int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon);

int ecryptfs_parse_packet_length(unsigned char *data, size_t *size,

				 size_t *length_size);

int ecryptfs_write_packet_length(char *dest, size_t size,
@@ -671,8 +662,7 @@ int ecryptfs_send_miscdev(char *data, size_t data_size, 
			  u16 msg_flags, struct ecryptfs_daemon *daemon);

void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx);

int

ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, uid_t euid,

		      struct user_namespace *user_ns, struct pid *pid);

ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, struct file *file);

int ecryptfs_init_kthread(void);

void ecryptfs_destroy_kthread(void);

int ecryptfs_privileged_open(struct file **lower_file,

fs/ecryptfs/file.c

+40 −50
Original line number Diff line number Diff line
@@ -138,29 +138,50 @@ static int ecryptfs_readdir(struct file *file, void *dirent, filldir_t filldir) 
	return rc;

}



static void ecryptfs_vma_close(struct vm_area_struct *vma)

struct kmem_cache *ecryptfs_file_info_cache;



static int read_or_initialize_metadata(struct dentry *dentry)

{

	filemap_write_and_wait(vma->vm_file->f_mapping);

	struct inode *inode = dentry->d_inode;

	struct ecryptfs_mount_crypt_stat *mount_crypt_stat;

	struct ecryptfs_crypt_stat *crypt_stat;

	int rc;



	crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;

	mount_crypt_stat = &ecryptfs_superblock_to_private(

						inode->i_sb)->mount_crypt_stat;

	mutex_lock(&crypt_stat->cs_mutex);



	if (crypt_stat->flags & ECRYPTFS_POLICY_APPLIED &&

	    crypt_stat->flags & ECRYPTFS_KEY_VALID) {

		rc = 0;

		goto out;

	}



static const struct vm_operations_struct ecryptfs_file_vm_ops = {

	.close		= ecryptfs_vma_close,

	.fault		= filemap_fault,

};

	rc = ecryptfs_read_metadata(dentry);

	if (!rc)

		goto out;



static int ecryptfs_file_mmap(struct file *file, struct vm_area_struct *vma)

{

	int rc;

	if (mount_crypt_stat->flags & ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED) {

		crypt_stat->flags &= ~(ECRYPTFS_I_SIZE_INITIALIZED

				       | ECRYPTFS_ENCRYPTED);

		rc = 0;

		goto out;

	}



	rc = generic_file_mmap(file, vma);

	if (!(mount_crypt_stat->flags & ECRYPTFS_XATTR_METADATA_ENABLED) &&

	    !i_size_read(ecryptfs_inode_to_lower(inode))) {

		rc = ecryptfs_initialize_file(dentry, inode);

		if (!rc)

		vma->vm_ops = &ecryptfs_file_vm_ops;

			goto out;

	}



	rc = -EIO;

out:

	mutex_unlock(&crypt_stat->cs_mutex);

	return rc;

}



struct kmem_cache *ecryptfs_file_info_cache;



/**

 * ecryptfs_open

 * @inode: inode speciying file to open
@@ -236,32 +257,9 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
		rc = 0;

		goto out;

	}

	mutex_lock(&crypt_stat->cs_mutex);

	if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)

	    || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) {

		rc = ecryptfs_read_metadata(ecryptfs_dentry);

		if (rc) {

			ecryptfs_printk(KERN_DEBUG,

					"Valid headers not found\n");

			if (!(mount_crypt_stat->flags

			      & ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {

				rc = -EIO;

				printk(KERN_WARNING "Either the lower file "

				       "is not in a valid eCryptfs format, "

				       "or the key could not be retrieved. "

				       "Plaintext passthrough mode is not "

				       "enabled; returning -EIO\n");

				mutex_unlock(&crypt_stat->cs_mutex);

	rc = read_or_initialize_metadata(ecryptfs_dentry);

	if (rc)

		goto out_put;

			}

			rc = 0;

			crypt_stat->flags &= ~(ECRYPTFS_I_SIZE_INITIALIZED

					       | ECRYPTFS_ENCRYPTED);

			mutex_unlock(&crypt_stat->cs_mutex);

			goto out;

		}

	}

	mutex_unlock(&crypt_stat->cs_mutex);

	ecryptfs_printk(KERN_DEBUG, "inode w/ addr = [0x%p], i_ino = "

			"[0x%.16lx] size: [0x%.16llx]\n", inode, inode->i_ino,

			(unsigned long long)i_size_read(inode));
@@ -292,15 +290,7 @@ static int ecryptfs_release(struct inode *inode, struct file *file) 
static int

ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)

{

	int rc = 0;



	rc = generic_file_fsync(file, start, end, datasync);

	if (rc)

		goto out;

	rc = vfs_fsync_range(ecryptfs_file_to_lower(file), start, end,

			     datasync);

out:

	return rc;

	return vfs_fsync(ecryptfs_file_to_lower(file), datasync);

}



static int ecryptfs_fasync(int fd, struct file *file, int flag)
@@ -369,7 +359,7 @@ const struct file_operations ecryptfs_main_fops = { 
#ifdef CONFIG_COMPAT

	.compat_ioctl = ecryptfs_compat_ioctl,

#endif

	.mmap = ecryptfs_file_mmap,

	.mmap = generic_file_mmap,

	.open = ecryptfs_open,

	.flush = ecryptfs_flush,

	.release = ecryptfs_release,

fs/ecryptfs/inode.c

+34 −31
Original line number Diff line number Diff line
@@ -143,6 +143,31 @@ static int ecryptfs_interpose(struct dentry *lower_dentry, 
	return 0;

}



static int ecryptfs_do_unlink(struct inode *dir, struct dentry *dentry,

			      struct inode *inode)

{

	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);

	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);

	struct dentry *lower_dir_dentry;

	int rc;



	dget(lower_dentry);

	lower_dir_dentry = lock_parent(lower_dentry);

	rc = vfs_unlink(lower_dir_inode, lower_dentry);

	if (rc) {

		printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);

		goto out_unlock;

	}

	fsstack_copy_attr_times(dir, lower_dir_inode);

	set_nlink(inode, ecryptfs_inode_to_lower(inode)->i_nlink);

	inode->i_ctime = dir->i_ctime;

	d_drop(dentry);

out_unlock:

	unlock_dir(lower_dir_dentry);

	dput(lower_dentry);

	return rc;

}



/**

 * ecryptfs_do_create

 * @directory_inode: inode of the new file's dentry's parent in ecryptfs
@@ -182,8 +207,10 @@ ecryptfs_do_create(struct inode *directory_inode, 
	}

	inode = __ecryptfs_get_inode(lower_dentry->d_inode,

				     directory_inode->i_sb);

	if (IS_ERR(inode))

	if (IS_ERR(inode)) {

		vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);

		goto out_lock;

	}

	fsstack_copy_attr_times(directory_inode, lower_dir_dentry->d_inode);

	fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode);

out_lock:
@@ -200,7 +227,7 @@ ecryptfs_do_create(struct inode *directory_inode, 
 *

 * Returns zero on success

 */

static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,

int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,

			     struct inode *ecryptfs_inode)

{

	struct ecryptfs_crypt_stat *crypt_stat =
@@ -264,7 +291,9 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry, 
	 * that this on disk file is prepared to be an ecryptfs file */

	rc = ecryptfs_initialize_file(ecryptfs_dentry, ecryptfs_inode);

	if (rc) {

		drop_nlink(ecryptfs_inode);

		ecryptfs_do_unlink(directory_inode, ecryptfs_dentry,

				   ecryptfs_inode);

		make_bad_inode(ecryptfs_inode);

		unlock_new_inode(ecryptfs_inode);

		iput(ecryptfs_inode);

		goto out;
@@ -466,27 +495,7 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir, 


static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)

{

	int rc = 0;

	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);

	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);

	struct dentry *lower_dir_dentry;



	dget(lower_dentry);

	lower_dir_dentry = lock_parent(lower_dentry);

	rc = vfs_unlink(lower_dir_inode, lower_dentry);

	if (rc) {

		printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);

		goto out_unlock;

	}

	fsstack_copy_attr_times(dir, lower_dir_inode);

	set_nlink(dentry->d_inode,

		  ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink);

	dentry->d_inode->i_ctime = dir->i_ctime;

	d_drop(dentry);

out_unlock:

	unlock_dir(lower_dir_dentry);

	dput(lower_dentry);

	return rc;

	return ecryptfs_do_unlink(dir, dentry, dentry->d_inode);

}



static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry,
@@ -961,12 +970,6 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) 
			goto out;

	}



	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);

fs/ecryptfs/main.c

+22 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options, 
	char *fnek_src;

	char *cipher_key_bytes_src;

	char *fn_cipher_key_bytes_src;

	u8 cipher_code;



	*check_ruid = 0;
@@ -420,6 +421,18 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options, 
	    && !fn_cipher_key_bytes_set)

		mount_crypt_stat->global_default_fn_cipher_key_bytes =

			mount_crypt_stat->global_default_cipher_key_size;



	cipher_code = ecryptfs_code_for_cipher_string(

		mount_crypt_stat->global_default_cipher_name,

		mount_crypt_stat->global_default_cipher_key_size);

	if (!cipher_code) {

		ecryptfs_printk(KERN_ERR,

				"eCryptfs doesn't support cipher: %s",

				mount_crypt_stat->global_default_cipher_name);

		rc = -EINVAL;

		goto out;

	}



	mutex_lock(&key_tfm_list_mutex);

	if (!ecryptfs_tfm_exists(mount_crypt_stat->global_default_cipher_name,

				 NULL)) {
@@ -540,6 +553,15 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags 
	}



	ecryptfs_set_superblock_lower(s, path.dentry->d_sb);



	/**

	 * Set the POSIX ACL flag based on whether they're enabled in the lower

	 * mount. Force a read-only eCryptfs mount if the lower mount is ro.

	 * Allow a ro eCryptfs mount even when the lower mount is rw.

	 */

	s->s_flags = flags & ~MS_POSIXACL;

	s->s_flags |= path.dentry->d_sb->s_flags & (MS_RDONLY | MS_POSIXACL);



	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;

	s->s_blocksize = path.dentry->d_sb->s_blocksize;

	s->s_magic = ECRYPTFS_SUPER_MAGIC;

fs/ecryptfs/messaging.c

+16 −120
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ static struct mutex ecryptfs_msg_ctx_lists_mux; 
static struct hlist_head *ecryptfs_daemon_hash;

struct mutex ecryptfs_daemon_hash_mux;

static int ecryptfs_hash_bits;

#define ecryptfs_uid_hash(uid) \

        hash_long((unsigned long)uid, ecryptfs_hash_bits)

#define ecryptfs_current_euid_hash(uid) \

		hash_long((unsigned long)current_euid(), ecryptfs_hash_bits)



static u32 ecryptfs_msg_counter;

static struct ecryptfs_msg_ctx *ecryptfs_msg_ctx_arr;
@@ -105,26 +105,24 @@ void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx) 


/**

 * ecryptfs_find_daemon_by_euid

 * @euid: The effective user id which maps to the desired daemon id

 * @user_ns: The namespace in which @euid applies

 * @daemon: If return value is zero, points to the desired daemon pointer

 *

 * Must be called with ecryptfs_daemon_hash_mux held.

 *

 * Search the hash list for the given user id.

 * Search the hash list for the current effective user id.

 *

 * Returns zero if the user id exists in the list; non-zero otherwise.

 */

int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid,

				 struct user_namespace *user_ns)

int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon)

{

	struct hlist_node *elem;

	int rc;



	hlist_for_each_entry(*daemon, elem,

			     &ecryptfs_daemon_hash[ecryptfs_uid_hash(euid)],

			    &ecryptfs_daemon_hash[ecryptfs_current_euid_hash()],

			    euid_chain) {

		if ((*daemon)->euid == euid && (*daemon)->user_ns == user_ns) {

		if ((*daemon)->file->f_cred->euid == current_euid() &&

		    (*daemon)->file->f_cred->user_ns == current_user_ns()) {

			rc = 0;

			goto out;

		}
@@ -137,9 +135,7 @@ int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid, 
/**

 * ecryptfs_spawn_daemon - Create and initialize a new daemon struct

 * @daemon: Pointer to set to newly allocated daemon struct

 * @euid: Effective user id for the daemon

 * @user_ns: The namespace in which @euid applies

 * @pid: Process id for the daemon

 * @file: File used when opening /dev/ecryptfs

 *

 * Must be called ceremoniously while in possession of

 * ecryptfs_sacred_daemon_hash_mux
@@ -147,8 +143,7 @@ int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid, 
 * Returns zero on success; non-zero otherwise

 */

int

ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, uid_t euid,

		      struct user_namespace *user_ns, struct pid *pid)

ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, struct file *file)

{

	int rc = 0;
@@ -159,16 +154,13 @@ ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, uid_t euid, 
		       "GFP_KERNEL memory\n", __func__, sizeof(**daemon));

		goto out;

	}

	(*daemon)->euid = euid;

	(*daemon)->user_ns = get_user_ns(user_ns);

	(*daemon)->pid = get_pid(pid);

	(*daemon)->task = current;

	(*daemon)->file = file;

	mutex_init(&(*daemon)->mux);

	INIT_LIST_HEAD(&(*daemon)->msg_ctx_out_queue);

	init_waitqueue_head(&(*daemon)->wait);

	(*daemon)->num_queued_msg_ctx = 0;

	hlist_add_head(&(*daemon)->euid_chain,

		       &ecryptfs_daemon_hash[ecryptfs_uid_hash(euid)]);

		       &ecryptfs_daemon_hash[ecryptfs_current_euid_hash()]);

out:

	return rc;

}
@@ -188,9 +180,6 @@ int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon) 
	if ((daemon->flags & ECRYPTFS_DAEMON_IN_READ)

	    || (daemon->flags & ECRYPTFS_DAEMON_IN_POLL)) {

		rc = -EBUSY;

		printk(KERN_WARNING "%s: Attempt to destroy daemon with pid "

		       "[0x%p], but it is in the midst of a read or a poll\n",

		       __func__, daemon->pid);

		mutex_unlock(&daemon->mux);

		goto out;

	}
@@ -203,55 +192,16 @@ int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon) 
		ecryptfs_msg_ctx_alloc_to_free(msg_ctx);

	}

	hlist_del(&daemon->euid_chain);

	if (daemon->task)

		wake_up_process(daemon->task);

	if (daemon->pid)

		put_pid(daemon->pid);

	if (daemon->user_ns)

		put_user_ns(daemon->user_ns);

	mutex_unlock(&daemon->mux);

	kzfree(daemon);

out:

	return rc;

}



/**

 * ecryptfs_process_quit

 * @euid: The user ID owner of the message

 * @user_ns: The namespace in which @euid applies

 * @pid: The process ID for the userspace program that sent the

 *       message

 *

 * Deletes the corresponding daemon for the given euid and pid, if

 * it is the registered that is requesting the deletion. Returns zero

 * after deleting the desired daemon; non-zero otherwise.

 */

int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns,

			  struct pid *pid)

{

	struct ecryptfs_daemon *daemon;

	int rc;



	mutex_lock(&ecryptfs_daemon_hash_mux);

	rc = ecryptfs_find_daemon_by_euid(&daemon, euid, user_ns);

	if (rc || !daemon) {

		rc = -EINVAL;

		printk(KERN_ERR "Received request from user [%d] to "

		       "unregister unrecognized daemon [0x%p]\n", euid, pid);

		goto out_unlock;

	}

	rc = ecryptfs_exorcise_daemon(daemon);

out_unlock:

	mutex_unlock(&ecryptfs_daemon_hash_mux);

	return rc;

}



/**

 * ecryptfs_process_reponse

 * @msg: The ecryptfs message received; the caller should sanity check

 *       msg->data_len and free the memory

 * @pid: The process ID of the userspace application that sent the

 *       message

 * @seq: The sequence number of the message; must match the sequence

 *       number for the existing message context waiting for this

 *       response
@@ -270,16 +220,11 @@ int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns, 
 *

 * Returns zero on success; non-zero otherwise

 */

int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,

			      struct user_namespace *user_ns, struct pid *pid,

			      u32 seq)

int ecryptfs_process_response(struct ecryptfs_daemon *daemon,

			      struct ecryptfs_message *msg, u32 seq)

{

	struct ecryptfs_daemon *uninitialized_var(daemon);

	struct ecryptfs_msg_ctx *msg_ctx;

	size_t msg_size;

	struct nsproxy *nsproxy;

	struct user_namespace *tsk_user_ns;

	uid_t ctx_euid;

	int rc;



	if (msg->index >= ecryptfs_message_buf_len) {
@@ -292,51 +237,6 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid, 
	}

	msg_ctx = &ecryptfs_msg_ctx_arr[msg->index];

	mutex_lock(&msg_ctx->mux);

	mutex_lock(&ecryptfs_daemon_hash_mux);

	rcu_read_lock();

	nsproxy = task_nsproxy(msg_ctx->task);

	if (nsproxy == NULL) {

		rc = -EBADMSG;

		printk(KERN_ERR "%s: Receiving process is a zombie. Dropping "

		       "message.\n", __func__);

		rcu_read_unlock();

		mutex_unlock(&ecryptfs_daemon_hash_mux);

		goto wake_up;

	}

	tsk_user_ns = __task_cred(msg_ctx->task)->user_ns;

	ctx_euid = task_euid(msg_ctx->task);

	rc = ecryptfs_find_daemon_by_euid(&daemon, ctx_euid, tsk_user_ns);

	rcu_read_unlock();

	mutex_unlock(&ecryptfs_daemon_hash_mux);

	if (rc) {

		rc = -EBADMSG;

		printk(KERN_WARNING "%s: User [%d] received a "

		       "message response from process [0x%p] but does "

		       "not have a registered daemon\n", __func__,

		       ctx_euid, pid);

		goto wake_up;

	}

	if (ctx_euid != euid) {

		rc = -EBADMSG;

		printk(KERN_WARNING "%s: Received message from user "

		       "[%d]; expected message from user [%d]\n", __func__,

		       euid, ctx_euid);

		goto unlock;

	}

	if (tsk_user_ns != user_ns) {

		rc = -EBADMSG;

		printk(KERN_WARNING "%s: Received message from user_ns "

		       "[0x%p]; expected message from user_ns [0x%p]\n",

		       __func__, user_ns, tsk_user_ns);

		goto unlock;

	}

	if (daemon->pid != pid) {

		rc = -EBADMSG;

		printk(KERN_ERR "%s: User [%d] sent a message response "

		       "from an unrecognized process [0x%p]\n",

		       __func__, ctx_euid, pid);

		goto unlock;

	}

	if (msg_ctx->state != ECRYPTFS_MSG_CTX_STATE_PENDING) {

		rc = -EINVAL;

		printk(KERN_WARNING "%s: Desired context element is not "
@@ -359,9 +259,8 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid, 
	}

	memcpy(msg_ctx->msg, msg, msg_size);

	msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_DONE;

	rc = 0;

wake_up:

	wake_up_process(msg_ctx->task);

	rc = 0;

unlock:

	mutex_unlock(&msg_ctx->mux);

out:
@@ -383,14 +282,11 @@ ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type, 
			     struct ecryptfs_msg_ctx **msg_ctx)

{

	struct ecryptfs_daemon *daemon;

	uid_t euid = current_euid();

	int rc;



	rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());

	rc = ecryptfs_find_daemon_by_euid(&daemon);

	if (rc || !daemon) {

		rc = -ENOTCONN;

		printk(KERN_ERR "%s: User [%d] does not have a daemon "

		       "registered\n", __func__, euid);

		goto out;

	}

	mutex_lock(&ecryptfs_msg_ctx_lists_mux);