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

Commit dcb0f222 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert proc to use kuid/kgid where appropriate 



Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 08cefc7a

fs/proc/array.c

+8 −2
Original line number Diff line number Diff line
@@ -191,8 +191,14 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, 
		task_tgid_nr_ns(p, ns),

		pid_nr_ns(pid, ns),

		ppid, tpid,

		cred->uid, cred->euid, cred->suid, cred->fsuid,

		cred->gid, cred->egid, cred->sgid, cred->fsgid);

		from_kuid_munged(user_ns, cred->uid),

		from_kuid_munged(user_ns, cred->euid),

		from_kuid_munged(user_ns, cred->suid),

		from_kuid_munged(user_ns, cred->fsuid),

		from_kgid_munged(user_ns, cred->gid),

		from_kgid_munged(user_ns, cred->egid),

		from_kgid_munged(user_ns, cred->sgid),

		from_kgid_munged(user_ns, cred->fsgid));



	task_lock(p);

	if (p->files)

fs/proc/base.c

+8 −8
Original line number Diff line number Diff line
@@ -1562,8 +1562,8 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) 
	generic_fillattr(inode, stat);



	rcu_read_lock();

	stat->uid = 0;

	stat->gid = 0;

	stat->uid = GLOBAL_ROOT_UID;

	stat->gid = GLOBAL_ROOT_GID;

	task = pid_task(proc_pid(inode), PIDTYPE_PID);

	if (task) {

		if (!has_pid_permissions(pid, task, 2)) {
@@ -1623,8 +1623,8 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd) 
			inode->i_gid = cred->egid;

			rcu_read_unlock();

		} else {

			inode->i_uid = 0;

			inode->i_gid = 0;

			inode->i_uid = GLOBAL_ROOT_UID;

			inode->i_gid = GLOBAL_ROOT_GID;

		}

		inode->i_mode &= ~(S_ISUID | S_ISGID);

		security_task_to_inode(task, inode);
@@ -1811,8 +1811,8 @@ static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd) 
					inode->i_gid = cred->egid;

					rcu_read_unlock();

				} else {

					inode->i_uid = 0;

					inode->i_gid = 0;

					inode->i_uid = GLOBAL_ROOT_UID;

					inode->i_gid = GLOBAL_ROOT_GID;

				}

				inode->i_mode &= ~(S_ISUID | S_ISGID);

				security_task_to_inode(task, inode);
@@ -2061,8 +2061,8 @@ static int map_files_d_revalidate(struct dentry *dentry, struct nameidata *nd) 
			inode->i_gid = cred->egid;

			rcu_read_unlock();

		} else {

			inode->i_uid = 0;

			inode->i_gid = 0;

			inode->i_uid = GLOBAL_ROOT_UID;

			inode->i_gid = GLOBAL_ROOT_GID;

		}

		security_task_to_inode(task, inode);

		status = 1;

fs/proc/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ static int proc_show_options(struct seq_file *seq, struct dentry *root) 
	struct super_block *sb = root->d_sb;

	struct pid_namespace *pid = sb->s_fs_info;



	if (pid->pid_gid)

		seq_printf(seq, ",gid=%lu", (unsigned long)pid->pid_gid);

	if (!gid_eq(pid->pid_gid, GLOBAL_ROOT_GID))

		seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, pid->pid_gid));

	if (pid->hide_pid != 0)

		seq_printf(seq, ",hidepid=%u", pid->hide_pid);

fs/proc/root.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int proc_parse_options(char *options, struct pid_namespace *pid) 
		case Opt_gid:

			if (match_int(&args[0], &option))

				return 0;

			pid->pid_gid = option;

			pid->pid_gid = make_kgid(current_user_ns(), option);

			break;

		case Opt_hidepid:

			if (match_int(&args[0], &option))

include/linux/pid_namespace.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct pid_namespace { 
#ifdef CONFIG_BSD_PROCESS_ACCT

	struct bsd_acct_struct *bacct;

#endif

	gid_t pid_gid;

	kgid_t pid_gid;

	int hide_pid;

	int reboot;	/* group exit code if this pidns was rebooted */

};