Merge branch 'serge-next' into next (3496f92b) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/ecryptfs/messaging.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -360,7 +360,7 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
		struct ecryptfs_msg_ctx *msg_ctx;
		size_t msg_size;
		struct nsproxy *nsproxy;
		struct user_namespace *current_user_ns;
		struct user_namespace *tsk_user_ns;
		uid_t ctx_euid;
		int rc;

		@@ -385,9 +385,9 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
		mutex_unlock(&ecryptfs_daemon_hash_mux);
		goto wake_up;
		}
		current_user_ns = nsproxy->user_ns;
		tsk_user_ns = __task_cred(msg_ctx->task)->user->user_ns;
		ctx_euid = task_euid(msg_ctx->task);
		rc = ecryptfs_find_daemon_by_euid(&daemon, ctx_euid, current_user_ns);
		rc = ecryptfs_find_daemon_by_euid(&daemon, ctx_euid, tsk_user_ns);
		rcu_read_unlock();
		mutex_unlock(&ecryptfs_daemon_hash_mux);
		if (rc) {
		@@ -405,11 +405,11 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
		euid, ctx_euid);
		goto unlock;
		}
		if (current_user_ns != user_ns) {
		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, nsproxy->user_ns);
		__func__, user_ns, tsk_user_ns);
		goto unlock;
		}
		if (daemon->pid != pid) {
		@@ -468,8 +468,7 @@ ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type,
		uid_t euid = current_euid();
		int rc;

		rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
		current->nsproxy->user_ns);
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
		if (rc \|\| !daemon) {
		rc = -ENOTCONN;
		printk(KERN_ERR "%s: User [%d] does not have a daemon "

fs/ecryptfs/miscdev.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -47,8 +47,7 @@ ecryptfs_miscdev_poll(struct file file, poll_table pt)

		mutex_lock(&ecryptfs_daemon_hash_mux);
		/* TODO: Just use file->private_data? */
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
		current->nsproxy->user_ns);
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
		BUG_ON(rc \|\| !daemon);
		mutex_lock(&daemon->mux);
		mutex_unlock(&ecryptfs_daemon_hash_mux);
		@@ -95,11 +94,9 @@ ecryptfs_miscdev_open(struct inode inode, struct file file)
		"count; rc = [%d]\n", __func__, rc);
		goto out_unlock_daemon_list;
		}
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
		current->nsproxy->user_ns);
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
		if (rc \|\| !daemon) {
		rc = ecryptfs_spawn_daemon(&daemon, euid,
		current->nsproxy->user_ns,
		rc = ecryptfs_spawn_daemon(&daemon, euid, current_user_ns(),
		task_pid(current));
		if (rc) {
		printk(KERN_ERR "%s: Error attempting to spawn daemon; "
		@@ -153,8 +150,7 @@ ecryptfs_miscdev_release(struct inode inode, struct file file)
		int rc;

		mutex_lock(&ecryptfs_daemon_hash_mux);
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
		current->nsproxy->user_ns);
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
		BUG_ON(rc \|\| !daemon);
		mutex_lock(&daemon->mux);
		BUG_ON(daemon->pid != task_pid(current));
		@@ -254,8 +250,7 @@ ecryptfs_miscdev_read(struct file file, char __user buf, size_t count,

		mutex_lock(&ecryptfs_daemon_hash_mux);
		/* TODO: Just use file->private_data? */
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
		current->nsproxy->user_ns);
		rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
		BUG_ON(rc \|\| !daemon);
		mutex_lock(&daemon->mux);
		if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) {
		@@ -295,7 +290,7 @@ ecryptfs_miscdev_read(struct file file, char __user buf, size_t count,
		goto check_list;
		}
		BUG_ON(euid != daemon->euid);
		BUG_ON(current->nsproxy->user_ns != daemon->user_ns);
		BUG_ON(current_user_ns() != daemon->user_ns);
		BUG_ON(task_pid(current) != daemon->pid);
		msg_ctx = list_first_entry(&daemon->msg_ctx_out_queue,
		struct ecryptfs_msg_ctx, daemon_out_list);
		@@ -468,7 +463,7 @@ ecryptfs_miscdev_write(struct file file, const char __user buf,
		goto out_free;
		}
		rc = ecryptfs_miscdev_response(&data[i], packet_size,
		euid, current->nsproxy->user_ns,
		euid, current_user_ns(),
		task_pid(current), seq);
		if (rc)
		printk(KERN_WARNING "%s: Failed to deliver miscdev "

include/linux/cred.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ do { \
		} while (0)

		extern struct group_info *groups_alloc(int);
		extern struct group_info init_groups;
		extern void groups_free(struct group_info *);
		extern int set_current_groups(struct group_info *);
		extern int set_groups(struct cred , struct group_info );
		@@ -315,6 +316,7 @@ static inline void put_cred(const struct cred *_cred)
		#define current_fsgid() (current_cred_xxx(fsgid))
		#define current_cap() (current_cred_xxx(cap_effective))
		#define current_user() (current_cred_xxx(user))
		#define current_user_ns() (current_cred_xxx(user)->user_ns)
		#define current_security() (current_cred_xxx(security))

		#define current_uid_gid(_uid, _gid) \

include/linux/init_task.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ extern struct nsproxy init_nsproxy;
		.mnt_ns = NULL, \
		INIT_NET_NS(net_ns) \
		INIT_IPC_NS(ipc_ns) \
		.user_ns = &init_user_ns, \
		}

		#define INIT_SIGHAND(sighand) { \

include/linux/nsproxy.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ struct nsproxy {
		struct ipc_namespace *ipc_ns;
		struct mnt_namespace *mnt_ns;
		struct pid_namespace *pid_ns;
		struct user_namespace *user_ns;
		struct net *net_ns;
		};
		extern struct nsproxy init_nsproxy;