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

Commit db978da8 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Paul Moore
Browse files

proc: Pass file mode to proc_pid_make_inode 



Pass the file mode of the proc inode to be created to
proc_pid_make_inode.  In proc_pid_make_inode, initialize inode->i_mode
before calling security_task_to_inode.  This allows selinux to set
isec->sclass right away without introducing "half-initialized" inode
security structs.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 42059112

fs/proc/base.c

+9 −14
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ const struct inode_operations proc_pid_link_inode_operations = { 


/* building an inode */



struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task)

struct inode *proc_pid_make_inode(struct super_block * sb,

				  struct task_struct *task, umode_t mode)

{

	struct inode * inode;

	struct proc_inode *ei;
@@ -1677,6 +1678,7 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t 


	/* Common stuff */

	ei = PROC_I(inode);

	inode->i_mode = mode;

	inode->i_ino = get_next_ino();

	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

	inode->i_op = &proc_def_inode_operations;
@@ -2003,7 +2005,9 @@ proc_map_files_instantiate(struct inode *dir, struct dentry *dentry, 
	struct proc_inode *ei;

	struct inode *inode;



	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK |

				    ((mode & FMODE_READ ) ? S_IRUSR : 0) |

				    ((mode & FMODE_WRITE) ? S_IWUSR : 0));

	if (!inode)

		return -ENOENT;
@@ -2012,12 +2016,6 @@ proc_map_files_instantiate(struct inode *dir, struct dentry *dentry, 


	inode->i_op = &proc_map_files_link_inode_operations;

	inode->i_size = 64;

	inode->i_mode = S_IFLNK;



	if (mode & FMODE_READ)

		inode->i_mode |= S_IRUSR;

	if (mode & FMODE_WRITE)

		inode->i_mode |= S_IWUSR;



	d_set_d_op(dentry, &tid_map_files_dentry_operations);

	d_add(dentry, inode);
@@ -2371,12 +2369,11 @@ static int proc_pident_instantiate(struct inode *dir, 
	struct inode *inode;

	struct proc_inode *ei;



	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, p->mode);

	if (!inode)

		goto out;



	ei = PROC_I(inode);

	inode->i_mode = p->mode;

	if (S_ISDIR(inode->i_mode))

		set_nlink(inode, 2);	/* Use getattr to fix if necessary */

	if (p->iop)
@@ -3058,11 +3055,10 @@ static int proc_pid_instantiate(struct inode *dir, 
{

	struct inode *inode;



	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, S_IFDIR | S_IRUGO | S_IXUGO);

	if (!inode)

		goto out;



	inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;

	inode->i_op = &proc_tgid_base_inode_operations;

	inode->i_fop = &proc_tgid_base_operations;

	inode->i_flags|=S_IMMUTABLE;
@@ -3351,11 +3347,10 @@ static int proc_task_instantiate(struct inode *dir, 
	struct dentry *dentry, struct task_struct *task, const void *ptr)

{

	struct inode *inode;

	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, S_IFDIR | S_IRUGO | S_IXUGO);



	if (!inode)

		goto out;

	inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;

	inode->i_op = &proc_tid_base_inode_operations;

	inode->i_fop = &proc_tid_base_operations;

	inode->i_flags|=S_IMMUTABLE;

fs/proc/fd.c

+2 −4
Original line number Diff line number Diff line
@@ -183,14 +183,13 @@ proc_fd_instantiate(struct inode *dir, struct dentry *dentry, 
	struct proc_inode *ei;

	struct inode *inode;



	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK);

	if (!inode)

		goto out;



	ei = PROC_I(inode);

	ei->fd = fd;



	inode->i_mode = S_IFLNK;

	inode->i_op = &proc_pid_link_inode_operations;

	inode->i_size = 64;
@@ -322,14 +321,13 @@ proc_fdinfo_instantiate(struct inode *dir, struct dentry *dentry, 
	struct proc_inode *ei;

	struct inode *inode;



	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, S_IFREG | S_IRUSR);

	if (!inode)

		goto out;



	ei = PROC_I(inode);

	ei->fd = fd;



	inode->i_mode = S_IFREG | S_IRUSR;

	inode->i_fop = &proc_fdinfo_file_operations;



	d_set_d_op(dentry, &tid_fd_dentry_operations);

fs/proc/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *, 
extern const struct dentry_operations pid_dentry_operations;

extern int pid_getattr(struct vfsmount *, struct dentry *, struct kstat *);

extern int proc_setattr(struct dentry *, struct iattr *);

extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *);

extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t);

extern int pid_revalidate(struct dentry *, unsigned int);

extern int pid_delete_dentry(const struct dentry *);

extern int proc_pid_readdir(struct file *, struct dir_context *);

fs/proc/namespaces.c

+1 −2
Original line number Diff line number Diff line
@@ -92,12 +92,11 @@ static int proc_ns_instantiate(struct inode *dir, 
	struct inode *inode;

	struct proc_inode *ei;



	inode = proc_pid_make_inode(dir->i_sb, task);

	inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK | S_IRWXUGO);

	if (!inode)

		goto out;



	ei = PROC_I(inode);

	inode->i_mode = S_IFLNK|S_IRWXUGO;

	inode->i_op = &proc_ns_link_inode_operations;

	ei->ns_ops = ns_ops;

security/selinux/hooks.c

+1 −0
Original line number Diff line number Diff line
@@ -3955,6 +3955,7 @@ static void selinux_task_to_inode(struct task_struct *p, 
	struct inode_security_struct *isec = inode->i_security;

	u32 sid = task_sid(p);



	isec->sclass = inode_mode_to_security_class(inode->i_mode);

	isec->sid = sid;

	isec->initialized = LABEL_INITIALIZED;

}