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

Commit d0eafc7d authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

CRED: Wrap task credential accesses in the devpts filesystem 



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>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 39efd191

fs/devpts/inode.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -594,9 +594,9 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty) 
	if (!inode)

	if (!inode)

		return -ENOMEM;

		return -ENOMEM;





	inode->i_ino = number+2;

	inode->i_ino = number + 3;

	inode->i_uid = config.setuid ? config.uid : current_fsuid();

	inode->i_uid = opts->setuid ? opts->uid : current_fsuid();

	inode->i_gid = config.setgid ? config.gid : current_fsgid();

	inode->i_gid = opts->setgid ? opts->gid : current_fsgid();

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

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

	init_special_inode(inode, S_IFCHR|opts->mode, device);

	init_special_inode(inode, S_IFCHR|opts->mode, device);

	inode->i_private = tty;

	inode->i_private = tty;