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

Commit da9592ed authored by David Howells's avatar David Howells Committed by James Morris
Browse files

CRED: Wrap task credential accesses in the filesystem subsystem 



Wrap access to task credentials so that they can be separated more easily from
the task_struct during the introduction of COW creds.

Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().

Change some task->e?[ug]id to task_e?[ug]id().  In some places it makes more
sense to use RCU directly rather than a convenient wrapper; these will be
addressed by later patches.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 82ab8ded

fs/anon_inodes.c

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ static struct inode *anon_inode_mkinode(void) 
	 */

	inode->i_state = I_DIRTY;

	inode->i_mode = S_IRUSR | S_IWUSR;

	inode->i_uid = current->fsuid;

	inode->i_gid = current->fsgid;

	inode->i_uid = current_fsuid();

	inode->i_gid = current_fsgid();

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

	return inode;

}

fs/attr.c

+2 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ int inode_change_ok(struct inode *inode, struct iattr *attr) 


	/* Make sure a caller can chown. */

	if ((ia_valid & ATTR_UID) &&

	    (current->fsuid != inode->i_uid ||

	    (current_fsuid() != inode->i_uid ||

	     attr->ia_uid != inode->i_uid) && !capable(CAP_CHOWN))

		goto error;



	/* Make sure caller can chgrp. */

	if ((ia_valid & ATTR_GID) &&

	    (current->fsuid != inode->i_uid ||

	    (current_fsuid() != inode->i_uid ||

	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&

	    !capable(CAP_CHOWN))

		goto error;

fs/binfmt_elf_fdpic.c

+4 −4
Original line number Diff line number Diff line
@@ -623,10 +623,10 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 
	NEW_AUX_ENT(AT_BASE,	interp_params->elfhdr_addr);

	NEW_AUX_ENT(AT_FLAGS,	0);

	NEW_AUX_ENT(AT_ENTRY,	exec_params->entry_addr);

	NEW_AUX_ENT(AT_UID,	(elf_addr_t) current->uid);

	NEW_AUX_ENT(AT_EUID,	(elf_addr_t) current->euid);

	NEW_AUX_ENT(AT_GID,	(elf_addr_t) current->gid);

	NEW_AUX_ENT(AT_EGID,	(elf_addr_t) current->egid);

	NEW_AUX_ENT(AT_UID,	(elf_addr_t) current_uid());

	NEW_AUX_ENT(AT_EUID,	(elf_addr_t) current_euid());

	NEW_AUX_ENT(AT_GID,	(elf_addr_t) current_gid());

	NEW_AUX_ENT(AT_EGID,	(elf_addr_t) current_egid());

	NEW_AUX_ENT(AT_SECURE,	security_bprm_secureexec(bprm));

	NEW_AUX_ENT(AT_EXECFN,	bprm->exec);

fs/dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static inline int need_print_warning(struct dquot *dquot) 


	switch (dquot->dq_type) {

		case USRQUOTA:

			return current->fsuid == dquot->dq_id;

			return current_fsuid() == dquot->dq_id;

		case GRPQUOTA:

			return in_group_p(dquot->dq_id);

	}
@@ -981,7 +981,7 @@ static void send_warning(const struct dquot *dquot, const char warntype) 
		MINOR(dquot->dq_sb->s_dev));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID, current->user->uid);

	ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID, current_uid());

	if (ret)

		goto attr_err_out;

	genlmsg_end(skb, msg_head);

fs/exec.c

+9 −9
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ int flush_old_exec(struct linux_binprm * bprm) 
	/* This is the point of no return */

	current->sas_ss_sp = current->sas_ss_size = 0;



	if (current->euid == current->uid && current->egid == current->gid)

	if (current_euid() == current_uid() && current_egid() == current_gid())

		set_dumpable(current->mm, 1);

	else

		set_dumpable(current->mm, suid_dumpable);
@@ -1007,7 +1007,7 @@ int flush_old_exec(struct linux_binprm * bprm) 
	 */

	current->mm->task_size = TASK_SIZE;



	if (bprm->e_uid != current->euid || bprm->e_gid != current->egid) {

	if (bprm->e_uid != current_euid() || bprm->e_gid != current_egid()) {

		suid_keys(current);

		set_dumpable(current->mm, suid_dumpable);

		current->pdeath_signal = 0;
@@ -1047,8 +1047,8 @@ int prepare_binprm(struct linux_binprm *bprm) 
	if (bprm->file->f_op == NULL)

		return -EACCES;



	bprm->e_uid = current->euid;

	bprm->e_gid = current->egid;

	bprm->e_uid = current_euid();

	bprm->e_gid = current_egid();



	if(!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)) {

		/* Set-uid? */
@@ -1096,7 +1096,7 @@ void compute_creds(struct linux_binprm *bprm) 
{

	int unsafe;



	if (bprm->e_uid != current->uid) {

	if (bprm->e_uid != current_uid()) {

		suid_keys(current);

		current->pdeath_signal = 0;

	}
@@ -1424,7 +1424,7 @@ static int format_corename(char *corename, long signr) 
			/* uid */

			case 'u':

				rc = snprintf(out_ptr, out_end - out_ptr,

					      "%d", current->uid);

					      "%d", current_uid());

				if (rc > out_end - out_ptr)

					goto out;

				out_ptr += rc;
@@ -1432,7 +1432,7 @@ static int format_corename(char *corename, long signr) 
			/* gid */

			case 'g':

				rc = snprintf(out_ptr, out_end - out_ptr,

					      "%d", current->gid);

					      "%d", current_gid());

				if (rc > out_end - out_ptr)

					goto out;

				out_ptr += rc;
@@ -1709,7 +1709,7 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs) 
	struct inode * inode;

	struct file * file;

	int retval = 0;

	int fsuid = current->fsuid;

	int fsuid = current_fsuid();

	int flag = 0;

	int ispipe = 0;

	unsigned long core_limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
@@ -1815,7 +1815,7 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs) 
	 * Dont allow local users get cute and trick others to coredump

	 * into their pre-created files:

	 */

	if (inode->i_uid != current->fsuid)

	if (inode->i_uid != current_fsuid())

		goto close_fail;

	if (!file->f_op)

		goto close_fail;