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

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

CRED: Wrap current->cred and a few other accessors 



Wrap current->cred and a few other accessors to hide their actual
implementation.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent f1752eec

arch/ia64/ia32/sys_ia32.c

+3 −4
Original line number Diff line number Diff line
@@ -1767,25 +1767,24 @@ groups16_from_user(struct group_info *group_info, short __user *grouplist) 
asmlinkage long

sys32_getgroups16 (int gidsetsize, short __user *grouplist)

{

	const struct cred *cred = current_cred();

	int i;



	if (gidsetsize < 0)

		return -EINVAL;



	get_group_info(current->cred->group_info);

	i = current->cred->group_info->ngroups;

	i = cred->group_info->ngroups;

	if (gidsetsize) {

		if (i > gidsetsize) {

			i = -EINVAL;

			goto out;

		}

		if (groups16_to_user(grouplist, current->cred->group_info)) {

		if (groups16_to_user(grouplist, cred->group_info)) {

			i = -EFAULT;

			goto out;

		}

	}

out:

	put_group_info(current->cred->group_info);

	return i;

}

drivers/net/tun.c

+5 −3
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) 
	struct tun_net *tn;

	struct tun_struct *tun;

	struct net_device *dev;

	const struct cred *cred = current_cred();

	int err;



	tn = net_generic(net, tun_net_id);
@@ -712,12 +713,13 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) 


		/* Check permissions */

		if (((tun->owner != -1 &&

		      current_euid() != tun->owner) ||

		      cred->euid != tun->owner) ||

		     (tun->group != -1 &&

		      current_egid() != tun->group)) &&

		     !capable(CAP_NET_ADMIN))

		      cred->egid != tun->group)) &&

		    !capable(CAP_NET_ADMIN)) {

			return -EPERM;

		}

	}

	else if (__dev_get_by_name(net, ifr->ifr_name))

		return -EINVAL;

	else {

drivers/usb/core/devio.c

+6 −4
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ static int usbdev_open(struct inode *inode, struct file *file) 
{

	struct usb_device *dev = NULL;

	struct dev_state *ps;

	const struct cred *cred = current_cred();

	int ret;



	lock_kernel();
@@ -617,8 +618,8 @@ static int usbdev_open(struct inode *inode, struct file *file) 
	init_waitqueue_head(&ps->wait);

	ps->discsignr = 0;

	ps->disc_pid = get_pid(task_pid(current));

	ps->disc_uid = current_uid();

	ps->disc_euid = current_euid();

	ps->disc_uid = cred->uid;

	ps->disc_euid = cred->euid;

	ps->disccontext = NULL;

	ps->ifclaimed = 0;

	security_task_getsecid(current, &ps->secid);
@@ -967,6 +968,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
	struct usb_host_endpoint *ep;

	struct async *as;

	struct usb_ctrlrequest *dr = NULL;

	const struct cred *cred = current_cred();

	unsigned int u, totlen, isofrmlen;

	int ret, ifnum = -1;

	int is_in;
@@ -1174,8 +1176,8 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
	as->signr = uurb->signr;

	as->ifnum = ifnum;

	as->pid = get_pid(task_pid(current));

	as->uid = current_uid();

	as->euid = current_euid();

	as->uid = cred->uid;

	as->euid = cred->euid;

	security_task_getsecid(current, &as->secid);

	if (!is_in) {

		if (copy_from_user(as->urb->transfer_buffer, uurb->buffer,

fs/binfmt_elf.c

+5 −5
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 
	int items;

	elf_addr_t *elf_info;

	int ei_index = 0;

	struct task_struct *tsk = current;

	const struct cred *cred = current_cred();

	struct vm_area_struct *vma;



	/*
@@ -223,10 +223,10 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 
	NEW_AUX_ENT(AT_BASE, interp_load_addr);

	NEW_AUX_ENT(AT_FLAGS, 0);

	NEW_AUX_ENT(AT_ENTRY, exec->e_entry);

	NEW_AUX_ENT(AT_UID, tsk->cred->uid);

	NEW_AUX_ENT(AT_EUID, tsk->cred->euid);

	NEW_AUX_ENT(AT_GID, tsk->cred->gid);

	NEW_AUX_ENT(AT_EGID, tsk->cred->egid);

	NEW_AUX_ENT(AT_UID, cred->uid);

	NEW_AUX_ENT(AT_EUID, cred->euid);

	NEW_AUX_ENT(AT_GID, cred->gid);

	NEW_AUX_ENT(AT_EGID, cred->egid);

 	NEW_AUX_ENT(AT_SECURE, security_bprm_secureexec(bprm));

	NEW_AUX_ENT(AT_EXECFN, bprm->exec);

	if (k_platform) {

fs/binfmt_elf_fdpic.c

+5 −4
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 
				   struct elf_fdpic_params *exec_params,

				   struct elf_fdpic_params *interp_params)

{

	const struct cred *cred = current_cred();

	unsigned long sp, csp, nitems;

	elf_caddr_t __user *argv, *envp;

	size_t platform_len = 0, len;
@@ -623,10 +624,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->cred->uid);

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

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

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

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

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

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

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

	NEW_AUX_ENT(AT_SECURE,	security_bprm_secureexec(bprm));

	NEW_AUX_ENT(AT_EXECFN,	bprm->exec);